Skip to content

Commit

Permalink
Use test conversion script from source
Browse files Browse the repository at this point in the history
No longer install the script to convert CTest results to JUnit and
instead use the files from the cloned git source for it.

Fixes #3514

Change-Id: Ida4f2ab563601153b0b218c9bc6b7cfdb4969f01
  • Loading branch information
acmnpv committed May 4, 2020
1 parent 2f43845 commit 653fef1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions admin/gitlab-ci/gromacs.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ simple-build:
- ctest -D ExperimentalTest --output-on-failure | tee ctestLog.log || true
- awk '/The following tests FAILED/,/^Errors while running CTest|^$/'
ctestLog.log | tee ctestErrors.log
- xsltproc scripts/CTest2JUnit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > JUnitTestResults.xml
- xsltproc $CI_PROJECT_DIR/scripts/CTest2JUnit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > JUnitTestResults.xml
- if [ -s ctestErrors.log ] ; then
echo "Error during running ctest";
exit 1;
Expand Down Expand Up @@ -542,7 +542,7 @@ gromacs:clang-8-cuda-10.1:release:build:
- ctest -D $CTEST_RUN_MODE --output-on-failure | tee ctestLog.log || true
- awk '/The following tests FAILED/,/^Errors while running CTest|^$/'
ctestLog.log | tee ctestErrors.log
- xsltproc scripts/CTest2JUnit.xsl Testing/`head -n 1 < Testing/TAG`/*.xml > JUnitTestResults.xml
- xsltproc $CI_PROJECT_DIR/scripts/CTest2JUnit.xsl Testing/`head -n 1 < Testing/TAG`/*.xml > JUnitTestResults.xml
- if [ -s ctestErrors.log ] ; then
echo "Error during running ctest";
exit 1;
Expand Down
2 changes: 0 additions & 2 deletions scripts/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/GMXRC.bash.cmakein ${CMAKE_CURRENT_BI
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/GMXRC.csh.cmakein ${CMAKE_CURRENT_BINARY_DIR}/GMXRC.csh @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/GMXRC.zsh.cmakein ${CMAKE_CURRENT_BINARY_DIR}/GMXRC.zsh @ONLY)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CTest2JUnit.xsl ${CMAKE_CURRENT_BINARY_DIR}/CTest2JUnit.xsl COPYONLY)

install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/GMXRC DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/GMXRC.bash DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/GMXRC.zsh DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime)
Expand Down

0 comments on commit 653fef1

Please sign in to comment.