From 151affd85f7c00a6165ab42834498b07a8145e53 Mon Sep 17 00:00:00 2001
From: Edward Hartnett <Edward.Hartnett@noaa.gov>
Date: Wed, 26 Aug 2020 13:52:29 -0600
Subject: [PATCH] now ncint tests repect WITH_MPIEXEC

---
 .github/workflows/a3.yml                      | 2 +-
 configure.ac                                  | 2 ++
 tests/ncint/Makefile.am                       | 4 +++-
 tests/ncint/{run_perf.sh => run_perf.sh.in}   | 2 +-
 tests/ncint/{run_tests.sh => run_tests.sh.in} | 4 ++--
 5 files changed, 9 insertions(+), 5 deletions(-)
 rename tests/ncint/{run_perf.sh => run_perf.sh.in} (91%)
 rename tests/ncint/{run_tests.sh => run_tests.sh.in} (87%)

diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml
index 6f326b86a3a..bcf6d84ba39 100644
--- a/.github/workflows/a3.yml
+++ b/.github/workflows/a3.yml
@@ -125,7 +125,7 @@ jobs:
         export PATH="/home/runner/openmpi/bin:$PATH"
         export CC=/home/runner/openmpi/bin/mpicc
         autoreconf -i
-        ./configure --with-mpiexec='mpiexec --oversubscribe'
+        ./configure --with-mpiexec='mpiexec --oversubscribe' --enable-netcdf-integration
         which mpiexec
         make check
     - name: cmake build
diff --git a/configure.ac b/configure.ac
index 1d8b48470d6..429a14e1e9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -401,6 +401,8 @@ AC_CONFIG_FILES([tests/general/pio_tutil.F90:tests/general/util/pio_tutil.F90])
 
 # The user may have changed the MPIEXEC for these test scripts.
 AC_CONFIG_FILES([tests/cunit/run_tests.sh], [chmod ugo+x tests/cunit/run_tests.sh])
+AC_CONFIG_FILES([tests/ncint/run_tests.sh], [chmod ugo+x tests/ncint/run_tests.sh])
+AC_CONFIG_FILES([tests/ncint/run_perf.sh], [chmod ugo+x tests/ncint/run_perf.sh])
 AC_CONFIG_FILES([examples/c/run_tests.sh], [chmod ugo+x examples/c/run_tests.sh])
 
 # Args:
diff --git a/tests/ncint/Makefile.am b/tests/ncint/Makefile.am
index b18ed51224a..adc01ddc0d6 100644
--- a/tests/ncint/Makefile.am
+++ b/tests/ncint/Makefile.am
@@ -23,7 +23,9 @@ TESTS = run_tests.sh run_perf.sh
 endif # RUN_TESTS
 
 # Distribute the test script.
-EXTRA_DIST = run_tests.sh run_perf.sh
+EXTRA_DIST = run_tests.sh.in run_perf.sh.in
 
 # Clean up files produced during testing.
 CLEANFILES = *.nc *.log
+
+DISTCLEANFILES = run_tests.sh run_perf.sh
diff --git a/tests/ncint/run_perf.sh b/tests/ncint/run_perf.sh.in
similarity index 91%
rename from tests/ncint/run_perf.sh
rename to tests/ncint/run_perf.sh.in
index 7f0d5fd9f53..1eb2d9460ec 100755
--- a/tests/ncint/run_perf.sh
+++ b/tests/ncint/run_perf.sh.in
@@ -20,7 +20,7 @@ for TEST in $PIO_TESTS
 do
     success1=false
     echo "running ${TEST}"
-    mpiexec -n 4 ./${TEST} && success1=true
+    @WITH_MPIEXEC@ -n 4 ./${TEST} && success1=true
     if test $success1 = false; then
         break
     fi
diff --git a/tests/ncint/run_tests.sh b/tests/ncint/run_tests.sh.in
similarity index 87%
rename from tests/ncint/run_tests.sh
rename to tests/ncint/run_tests.sh.in
index c21727ce557..cc85b8201b1 100755
--- a/tests/ncint/run_tests.sh
+++ b/tests/ncint/run_tests.sh.in
@@ -18,7 +18,7 @@ for TEST in $PIO_TESTS
 do
     success1=false
     echo "running ${TEST}"
-    mpiexec -n 4 ./${TEST} && success1=true
+    @WITH_MPIEXEC@ -n 4 ./${TEST} && success1=true
     if test $success1 = false; then
         break
     fi
@@ -30,7 +30,7 @@ done
 # do
 #     success2=false
 #     echo "running ${TEST}"
-#     mpiexec -n 8 ./${TEST} && success2=true
+#     @WITH_MPIEXEC@ -n 8 ./${TEST} && success2=true
 #     if test $success2 = false; then
 #         break
 #     fi