handle mpiexec for fncint and general dirs

jedwards4b · Aug 28, 2020 · a5fb922 · a5fb922
1 parent 9e4a39e
commit a5fb922
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -403,6 +403,8 @@ AC_CONFIG_FILES([tests/general/pio_tutil.F90:tests/general/util/pio_tutil.F90])
 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([tests/fncint/run_tests.sh], [chmod ugo+x tests/fncint/run_tests.sh])
+AC_CONFIG_FILES([tests/general/run_tests.sh], [chmod ugo+x tests/general/run_tests.sh])
 AC_CONFIG_FILES([tests/unit/run_tests.sh], [chmod ugo+x tests/unit/run_tests.sh])
 AC_CONFIG_FILES([examples/c/run_tests.sh], [chmod ugo+x examples/c/run_tests.sh])
 

diff --git a/tests/fncint/Makefile.am b/tests/fncint/Makefile.am
@@ -33,3 +33,5 @@ EXTRA_DIST = run_tests.sh
 
 # Clean up files produced during testing.
 CLEANFILES = *.nc *.log
+
+DISTCLEANFILES = run_tests.sh
diff --git a/tests/fncint/run_tests.sh → tests/fncint/run_tests.sh.in b/tests/fncint/run_tests.sh → tests/fncint/run_tests.sh.in
@@ -16,7 +16,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/general/Makefile.am b/tests/general/Makefile.am
@@ -89,7 +89,7 @@ pio_rearr_opts2.F90:pio_rearr_opts2.F90.in
 pio_rearr_opts.F90:pio_rearr_opts.F90.in
 
 # Distribute the test script.
-EXTRA_DIST = CMakeLists.txt run_tests.sh ncdf_fail.F90.in		\
+EXTRA_DIST = CMakeLists.txt run_tests.sh.in ncdf_fail.F90.in		\
 ncdf_get_put.F90.in ncdf_inq.F90.in ncdf_simple_tests.F90.in		\
 pio_decomp_fillval.F90.in pio_decomp_frame_tests.F90.in			\
 pio_decomp_tests_1d.F90.in pio_decomp_tests_2d.F90.in			\
@@ -101,3 +101,5 @@ pio_rearr_opts2.F90.in pio_rearr_opts.F90.in
 
 # Clean up files produced during testing.
 CLEANFILES = *.nc *.log *.mod
+
+DISTCLEANFILES = run_tests.sh
diff --git a/tests/general/run_tests.sh → tests/general/run_tests.sh.in b/tests/general/run_tests.sh → tests/general/run_tests.sh.in
@@ -23,7 +23,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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,3 +33,5 @@ EXTRA_DIST = run_tests.sh

		# Clean up files produced during testing.
		CLEANFILES = .nc .log

		DISTCLEANFILES = run_tests.sh