From c47785f30d214220e3f8bcf1591a762c02892c33 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Tue, 25 Jun 2024 10:59:03 +0200
Subject: [PATCH] Get rid of xsltproc because ctest now has an option for junit
reports
---
.gitlab-ci.yml | 4 +---
modules/find/tests/run_ctest.sh | 17 +++++++----------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 973fcae..0a81b23 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 d470690..0a5fad1 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
--
GitLab