now ncint tests repect WITH_MPIEXEC

jedwards4b · Aug 26, 2020 · 151affd · 151affd
1 parent 181373a
commit 151affd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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 → tests/ncint/run_perf.sh.in b/tests/ncint/run_perf.sh → 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 → tests/ncint/run_tests.sh.in b/tests/ncint/run_tests.sh → 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