From f6c4c9a3664509027f2671cd4c28a42158bf384f Mon Sep 17 00:00:00 2001
From: Dana Robinson <derobins@hdfgroup.org>
Date: Fri, 23 Aug 2024 12:55:14 -0700
Subject: [PATCH 1/4] Don't run AOCC parallel tests with -j2

Don't run parallel tests in both Autotools and CMake with multiple
processes. ph5diff still runs with -j2 w/ Autotools since the test
script is in the tools/test/h5diff directory.
---
 .github/workflows/aocc-auto.yml  | 14 +++++++++++++-
 .github/workflows/aocc-cmake.yml |  3 ++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/aocc-auto.yml b/.github/workflows/aocc-auto.yml
index a1927eb0403..be88728472f 100644
--- a/.github/workflows/aocc-auto.yml
+++ b/.github/workflows/aocc-auto.yml
@@ -86,12 +86,24 @@ jobs:
           make -j3
         working-directory: ${{ runner.workspace }}/build
 
+      # ph5diff tests are in the tools/tests directory so they will get run
+      # here
       - name: Autotools Run Tests
         env:
           NPROCS: 2
         run: |
           export PATH=/home/runner/work/hdf5/hdf5/openmpi-4.1.6-install/bin:/usr/local/bin:$PATH
-          make check -j
+          cd test && make check -j2 && cd ..
+          cd tools && make check -j2 && cd ..
+          cd hl && make check -j2 && cd ..
+        working-directory: ${{ runner.workspace }}/build
+
+      - name: Autotools Run Parallel Tests
+        env:
+          NPROCS: 2
+        run: |
+          export PATH=/home/runner/work/hdf5/hdf5/openmpi-4.1.6-install/bin:/usr/local/bin:$PATH
+          cd testpar && make check && cd ..
         working-directory: ${{ runner.workspace }}/build
 
       - name: Autotools Install
diff --git a/.github/workflows/aocc-cmake.yml b/.github/workflows/aocc-cmake.yml
index 71966caf41e..7ac25b7e990 100644
--- a/.github/workflows/aocc-cmake.yml
+++ b/.github/workflows/aocc-cmake.yml
@@ -89,5 +89,6 @@ jobs:
       - name: CMake Run Tests
         shell: bash
         run: |
-          ctest . --parallel 2 -C ${{ inputs.build_mode }} -V
+          ctest . -E MPI_TEST --parallel 2 -C ${{ inputs.build_mode }} -V
+          ctest . -R MPI_TEST -C ${{ inputs.build_mode }} -V
         working-directory: ${{ runner.workspace }}/build

From 9832025b9e088b0835eb1c6a4d9e6e095e8c751a Mon Sep 17 00:00:00 2001
From: Dana Robinson <derobins@hdfgroup.org>
Date: Fri, 23 Aug 2024 13:15:55 -0700
Subject: [PATCH 2/4] Split off AOCC CMake parallel tests

---
 .github/workflows/aocc-cmake.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/aocc-cmake.yml b/.github/workflows/aocc-cmake.yml
index 7ac25b7e990..92ac0d25fe8 100644
--- a/.github/workflows/aocc-cmake.yml
+++ b/.github/workflows/aocc-cmake.yml
@@ -90,5 +90,10 @@ jobs:
         shell: bash
         run: |
           ctest . -E MPI_TEST --parallel 2 -C ${{ inputs.build_mode }} -V
+        working-directory: ${{ runner.workspace }}/build
+
+      - name: CMake Run Parallel Tests
+        shell: bash
+        run: |
           ctest . -R MPI_TEST -C ${{ inputs.build_mode }} -V
         working-directory: ${{ runner.workspace }}/build

From d47583651640d1166fe80aed286f644b3a538273 Mon Sep 17 00:00:00 2001
From: Dana Robinson <derobins@hdfgroup.org>
Date: Fri, 23 Aug 2024 13:22:12 -0700
Subject: [PATCH 3/4] Remove unnecessary NPROCS env vars

---
 .github/workflows/aocc-auto.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/aocc-auto.yml b/.github/workflows/aocc-auto.yml
index be88728472f..209676b33f1 100644
--- a/.github/workflows/aocc-auto.yml
+++ b/.github/workflows/aocc-auto.yml
@@ -79,8 +79,6 @@ jobs:
 
       - name: Autotools Build
         shell: bash
-        env:
-          NPROCS: 2
         run: |
           export PATH=/home/runner/work/hdf5/hdf5/openmpi-4.1.6-install/bin:/usr/local/bin:$PATH
           make -j3
@@ -89,8 +87,6 @@ jobs:
       # ph5diff tests are in the tools/tests directory so they will get run
       # here
       - name: Autotools Run Tests
-        env:
-          NPROCS: 2
         run: |
           export PATH=/home/runner/work/hdf5/hdf5/openmpi-4.1.6-install/bin:/usr/local/bin:$PATH
           cd test && make check -j2 && cd ..
@@ -107,8 +103,6 @@ jobs:
         working-directory: ${{ runner.workspace }}/build
 
       - name: Autotools Install
-        env:
-          NPROCS: 2
         run: |
           export PATH=/home/runner/work/hdf5/hdf5/openmpi-4.1.6-install/bin:/usr/local/bin:$PATH
           make install

From ac3df1be548a16bbbf92a51690bcf8524d001c9d Mon Sep 17 00:00:00 2001
From: Dana Robinson <derobins@hdfgroup.org>
Date: Fri, 23 Aug 2024 13:25:46 -0700
Subject: [PATCH 4/4] Put NPROCS back in serial tests

We run ph5diff tests there
---
 .github/workflows/aocc-auto.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/aocc-auto.yml b/.github/workflows/aocc-auto.yml
index 209676b33f1..b556737e3b1 100644
--- a/.github/workflows/aocc-auto.yml
+++ b/.github/workflows/aocc-auto.yml
@@ -85,8 +85,10 @@ jobs:
         working-directory: ${{ runner.workspace }}/build
 
       # ph5diff tests are in the tools/tests directory so they will get run
-      # here
+      # here, so leave NPROCS set here as well
       - name: Autotools Run Tests
+        env:
+          NPROCS: 2
         run: |
           export PATH=/home/runner/work/hdf5/hdf5/openmpi-4.1.6-install/bin:/usr/local/bin:$PATH
           cd test && make check -j2 && cd ..