Skip to content

Commit

Permalink
Use ctest's built-in junit support
Browse files Browse the repository at this point in the history
The xsl file previously used for conversion has been removed from the CDash repository. Instead of
copying the file over to this repository, we can use ctest's built-in functionality to output a
junit file. This functionality exists since 3.21.
  • Loading branch information
msimberg committed Nov 18, 2024
1 parent df0cffe commit d0ea604
Showing 1 changed file with 5 additions and 24 deletions.
29 changes: 5 additions & 24 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,6 @@ defaults: &defaults
<<: *working_dir_default
<<: *docker_default

convert_xml: &convert_xml
name: Converting XML
when: always
command: |
mkdir -p ${CIRCLE_JOB}
curl \
https://raw.githubusercontent.com/Kitware/CDash/master/app/cdash/tests/circle/conv.xsl \
--fail -o $HOME/conv.xsl
xsltproc \
$HOME/conv.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml \
> ${CIRCLE_JOB}/Test.xml
move_core_dump: &move_core_dump
name: Moving core dumps
when: on_fail
Expand Down Expand Up @@ -343,11 +330,10 @@ jobs:
-j4 \
--timeout 60 \
-T test \
--output-junit ${CIRCLE_JOB}/Test.xml \
--no-compress-output \
--output-on-failure \
-R tests.examples
- run:
<<: *convert_xml
- run:
<<: *move_core_dump
- store_test_results:
Expand Down Expand Up @@ -384,12 +370,11 @@ jobs:
-j2 \
--timeout 120 \
-T test \
--output-junit ${CIRCLE_JOB}/Test.xml \
--no-compress-output \
--output-on-failure \
--tests-regex tests.unit \
--exclude-regex "tests.unit.modules.resource_partitioner.scheduler_binding_check"
- run:
<<: *convert_xml
- run:
<<: *move_core_dump
- store_test_results:
Expand All @@ -415,11 +400,10 @@ jobs:
-j2 \
--timeout 60 \
-T test \
--output-junit ${CIRCLE_JOB}/Test.xml \
--no-compress-output \
--output-on-failure \
-R tests.regressions
- run:
<<: *convert_xml
- run:
<<: *move_core_dump
- store_test_results:
Expand All @@ -440,11 +424,10 @@ jobs:
-j4 \
--timeout 60 \
-T test \
--output-junit ${CIRCLE_JOB}/Test.xml \
--no-compress-output \
--output-on-failure \
-R tests.headers
- run:
<<: *convert_xml
- store_test_results:
path: tests.headers
- store_artifacts:
Expand Down Expand Up @@ -585,12 +568,10 @@ jobs:
ctest \
-j2 \
--timeout 500 \
--output-junit ${CIRCLE_JOB}/Test.xml \
-T test \
--no-compress-output \
--output-on-failure
- run:
<<: *convert_xml
working_directory: /home/circleci/project/build
- run:
<<: *move_core_dump
working_directory: /home/circleci/project/build
Expand Down

0 comments on commit d0ea604

Please sign in to comment.