Output googletest junit

sethrj · Sep 19, 2024 · fc130a2 · fc130a2
1 parent 2ec2b66
commit fc130a2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 16 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -44,6 +44,8 @@ jobs:
                 matrix.special && '-' || '',
                 matrix.special)}}
       ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true # TODO: DELETEME, see #1305
+      CELER_JUNIT_OUTPUT: "${{github.workspace}}/test-output/"
+      GTEST_OUTPUT: "xml:${{env.CELER_JUNIT_OUTPUT}}google/"
     runs-on: ubuntu-latest
     container:
       image: >-
@@ -90,8 +92,8 @@ jobs:
         working-directory: build
         run: |
           ctest --parallel $(nproc) --timeout 180 --output-on-failure \
-            --output-junit test-results.junit.xml \
-            --test-output-size-passed=65536 --test-output-size-failed=1048576
+            --test-output-size-passed=65536 --test-output-size-failed=1048576 \
+            --output-junit "${{env.CELER_JUNIT_OUTPUT}}ctest/all.xml"
       - name: Install Celeritas
         working-directory: build
         run: |
@@ -123,7 +125,7 @@ jobs:
                || steps.test.outcome == 'failure'}}
         with:
           name: test-results-${{matrix.image}}-${{env.CMAKE_PRESET}}
-          path: "build/test-results.junit.xml"
+          path: "${{env.CELER_JUNIT_OUTPUT}}**/*.xml"
           if-no-files-found: error
           retention-days: 1
 

diff --git a/.github/workflows/build-fast.yml b/.github/workflows/build-fast.yml
@@ -39,6 +39,8 @@ jobs:
       CMAKE_PRESET: fast
       CC: ${{matrix.compiler}}-${{matrix.version}}
       CXX: ${{matrix.compiler == 'gcc' && 'g++' || 'clang++'}}-${{matrix.version}}
+      CELER_JUNIT_OUTPUT: "${{github.workspace}}\\test-output\\"
+      GTEST_OUTPUT: "xml:${{env.CELER_JUNIT_OUTPUT}}google\\"
     runs-on: >-
       ${{  matrix.runner == 'focal' && 'ubuntu-20.04'
         || matrix.runner == 'jammy' && 'ubuntu-22.04'
@@ -85,7 +87,7 @@ jobs:
         working-directory: build
         run: |
           ctest --parallel $(nproc) --timeout 15 --output-on-failure \
-            --output-junit test-results.junit.xml
+            --output-junit "${{env.CELER_JUNIT_OUTPUT}}ctest/all.xml"
       - name: Install
         working-directory: build
         run: |
@@ -104,7 +106,7 @@ jobs:
                || steps.test.outcome == 'failure'}}
         with:
           name: test-results-fast-${{matrix.compiler}}-${{matrix.version}}
-          path: "build/test-results.junit.xml"
+          path: "${{env.CELER_JUNIT_OUTPUT}}**/*.xml"
           if-no-files-found: error
           retention-days: 1
   windows:
@@ -115,6 +117,8 @@ jobs:
       CCACHE_DIR: "${{github.workspace}}\\.ccache"
       CCACHE_MAXSIZE: "100Mi"
       CMAKE_PRESET: fast
+      CELER_JUNIT_OUTPUT: "${{github.workspace}}/test-output/"
+      GTEST_OUTPUT: "xml:${{env.CELER_JUNIT_OUTPUT}}google/"
     runs-on: windows-latest
     steps:
       - name: Install dependencies
@@ -167,7 +171,7 @@ jobs:
                || steps.test.outcome == 'failure'}}
         with:
           name: test-results-fast-windows
-          path: "build/test-results.junit.xml"
+          path: "${{env.CELER_JUNIT_OUTPUT}}**/*.xml"
           if-no-files-found: error
           retention-days: 1
 

diff --git a/.github/workflows/build-spack.yml b/.github/workflows/build-spack.yml
@@ -56,6 +56,8 @@ jobs:
       SPACK_BUILDCACHE: "celer-buildcache" # see spack.yaml
       CC: "clang-15"
       CXX: "clang++-15"
+      CELER_JUNIT_OUTPUT: "${{github.workspace}}/test-output/"
+      GTEST_OUTPUT: "xml:${{env.CELER_JUNIT_OUTPUT}}google/"
     runs-on: ubuntu-22.04
     continue-on-error: false
     steps:
@@ -151,7 +153,7 @@ jobs:
             export CELER_TEST_STRICT=1
           fi
           ctest --parallel $(nproc) --timeout 15 --output-on-failure \
-            --output-junit test-results.junit.xml
+            --output-junit "${{env.CELER_JUNIT_OUTPUT}}ctest/all.xml"
       - name: Upload failed tests
         if: ${{steps.test.outcome == 'failure'}}
         uses: actions/upload-artifact@v4
@@ -170,7 +172,7 @@ jobs:
                || steps.test.outcome == 'failure')}}
         with:
           name: test-results-spack-${{env.CMAKE_PRESET}}-${{matrix.geant}}
-          path: "build/test-results.junit.xml"
+          path: "${{env.CELER_JUNIT_OUTPUT}}**/*.xml"
           if-no-files-found: error
           retention-days: 1
       - name: Check using build directory as install

diff --git a/.github/workflows/build-ultralite.yml b/.github/workflows/build-ultralite.yml
@@ -8,17 +8,14 @@ concurrency:
   group: build-ultralite-${{github.ref}}-${{github.event.pull_request.number || github.run_number}}-${{github.workflow}}
   cancel-in-progress: true
 
-# env:
-#   CCACHE_DEBUG: 1
-#   CCACHE_DEBUGDIR: ${{github.workspace}}/ccache-debug
-
 jobs:
   linux:
     name: ultralite-ubuntu
     env:
       CCACHE_DIR: "${{github.workspace}}/.ccache"
       CCACHE_MAXSIZE: "50Mi"
       CMAKE_PRESET: ultralite
+      CELER_JUNIT_OUTPUT: "${{github.workspace}}/test-output/"
     runs-on: ubuntu-latest
     steps:
       - name: Install dependencies
@@ -54,7 +51,7 @@ jobs:
         working-directory: build
         run: |
           ctest --parallel $(nproc) --timeout 15 --output-on-failure \
-            --output-junit test-results.junit.xml
+            --output-junit "${{env.CELER_JUNIT_OUTPUT}}ctest/all.xml"
       - name: Install
         working-directory: build
         run: |
@@ -81,7 +78,7 @@ jobs:
                || steps.test.outcome == 'failure'}}
         with:
           name: test-results-ultralite-ubuntu
-          path: "build/test-results.junit.xml"
+          path: "${{env.CELER_JUNIT_OUTPUT}}**/*.xml"
           if-no-files-found: error
           retention-days: 1
   windows:
@@ -143,7 +140,7 @@ jobs:
                || steps.test.outcome == 'failure'}}
         with:
           name: test-results-ultralite-windows
-          path: "build/test-results.junit.xml"
+          path: "${{env.CELER_JUNIT_OUTPUT}}**/*.xml"
           if-no-files-found: error
           retention-days: 1
 

diff --git a/scripts/cmake-presets/ci-windows-github.json b/scripts/cmake-presets/ci-windows-github.json
@@ -77,7 +77,7 @@
         "maxFailedTestOutputSize": 1048576,
         "maxPassedTestOutputSize": 65536,
         "outputOnFailure": true,
-        "outputJUnitFile": "test-results.junit.xml"
+        "outputJUnitFile": "$env{CELER_JUNIT_OUTPUT}\\ctest\\all.xml"
       }
     },
     {"name": "fast", "configurePreset": "fast", "inherits": "base"},