diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 973fcaef4144afe24e9ff98af8cb08b12a93920b..0a81b2303b165c22e5a944721d8e540d7fbb0997 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,8 +7,6 @@ Find: paths: - build reports: - junit: report.xml + junit: build/report.xml script: - modules/find/tests/run_ctest.sh - after_script: - - xsltproc -o report.xml /home/gitlab/ctest-to-junit.xsl build/Testing/**/Test.xml diff --git a/modules/find/tests/run_ctest.sh b/modules/find/tests/run_ctest.sh index d47069001aefb40048dfdeae23063cd77e98dede..0a5fad1c857a58b798881f296b407909f401886d 100755 --- a/modules/find/tests/run_ctest.sh +++ b/modules/find/tests/run_ctest.sh @@ -1,11 +1,8 @@ #!/bin/bash - -# env. var. CI_PROJECT_DIR required -[ -z "$CI_PROJECT_DIR" ] && echo "Variable CI_PROJECT_DIR must be set to execute this script." && exit 1 - -mkdir -p build -cd build - -cmake $CI_PROJECT_DIR/modules/find/tests -DENABLE_CTEST=ON -DLAPACKE_COMPONENTS="TMG" -DQUARK_COMPONENTS="HWLOC" -DCMAKE_PREFIX_PATH="$PARSEC_DIR" - -ctest --no-compress-output -T Test -V +set -ex +cmake -B build -S ./modules/find/tests \ + -DENABLE_CTEST=ON \ + -DLAPACKE_COMPONENTS="TMG" \ + -DQUARK_COMPONENTS="HWLOC" \ + -DCMAKE_PREFIX_PATH="$PARSEC_DIR" +ctest --test-dir build --no-compress-output --verbose --output-junit report.xml