Split serial and parallel tests as in AOCC action

HDFGroup · Aug 23, 2024 · d1072ea · d1072ea
1 parent c874eab
commit d1072ea
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/.github/workflows/main-auto-par.yml b/.github/workflows/main-auto-par.yml
@@ -50,8 +50,9 @@ jobs:
  - name: Get Sources
  uses: actions/checkout@v4.1.7
 
- # AUTOTOOLS CONFIGURE
  - name: Autotools Configure
+ env:
+ NPROCS: 2
  run: |
  sh ./autogen.sh
  mkdir "${{ runner.workspace }}/build"
@@ -71,12 +72,28 @@ jobs:
  --with-szlib=yes
  shell: bash
 
- # BUILD
  - name: Autotools Build
  run: make -j3
  working-directory: ${{ runner.workspace }}/build
 
+ # ph5diff tests are in the tools/tests directory so they will get run
+ # here, so leave NPROCS set here as well
  - name: Autotools Run Tests
- run: make check -j2
+ env:
+ NPROCS: 2
+ run: |
+ cd test && make check -j2 && cd ..
+ cd tools && make check -j2 && cd ..
+ cd hl && make check -j2 && cd ..
+ cd fortran/test && make check -j2 && cd ../..
+ working-directory: ${{ runner.workspace }}/build
+ if: ${{ inputs.thread_safety == 'disable' }}
+
+ - name: Autotools Run Parallel Tests
+ env:
+ NPROCS: 2
+ run: |
+ cd testpar && make check && cd ..
+ cd fortran/testpar && make check -j2 && cd ../..
  working-directory: ${{ runner.workspace }}/build
  if: ${{ inputs.thread_safety == 'disable' }}
diff --git a/.github/workflows/main-cmake-par.yml b/.github/workflows/main-cmake-par.yml
@@ -67,6 +67,11 @@ jobs:
  # RUN TESTS
  #
  - name: CMake Run Tests
- run: ctest . --parallel 2 -C ${{ inputs.build_mode }} -V
+ run: ctest . -E MPI_TEST --parallel 2 -C ${{ inputs.build_mode }} -V
+ working-directory: ${{ runner.workspace }}/build
+ if: ${{ matrix.run_tests && (inputs.thread_safety != 'TS') }}
+
+ - name: CMake Run Parallel Tests
+ run: ctest . -R MPI_TEST -C ${{ inputs.build_mode }} -V
  working-directory: ${{ runner.workspace }}/build
  if: ${{ matrix.run_tests && (inputs.thread_safety != 'TS') }}