From 653fef1d5537599070c07fa6d239d7b7e04bdfea Mon Sep 17 00:00:00 2001 From: Paul Bauer Date: Wed, 29 Apr 2020 09:23:54 +0000 Subject: [PATCH] Use test conversion script from source 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 --- admin/gitlab-ci/gromacs.gitlab-ci.yml | 4 ++-- scripts/CMakeLists.txt | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/admin/gitlab-ci/gromacs.gitlab-ci.yml b/admin/gitlab-ci/gromacs.gitlab-ci.yml index cb41bd921f..5e919e1738 100644 --- a/admin/gitlab-ci/gromacs.gitlab-ci.yml +++ b/admin/gitlab-ci/gromacs.gitlab-ci.yml @@ -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; @@ -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; diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 91bc0f2291..b536986cae 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -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) -- 2.22.0