MPIEXEC in examples/f03 directory, also set FC in fortran build

jedwards4b · Aug 28, 2020 · 6ec562a · 6ec562a
1 parent e835926
commit 6ec562a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/a4.yml b/.github/workflows/a4.yml
@@ -124,6 +124,7 @@ jobs:
         echo 'export PATH=/home/runner/mpich/bin:$PATH' > .bashrc
         source .bashrc
         export CC=/home/runner/mpich/bin/mpicc
+        export FC=/home/runner/mpich/bin/mpifort
         autoreconf -i
         ./configure --enable-fortran
         make -j check

diff --git a/configure.ac b/configure.ac
@@ -408,6 +408,7 @@ AC_CONFIG_FILES([tests/general/run_tests.sh], [chmod ugo+x tests/general/run_tes
 AC_CONFIG_FILES([tests/performance/run_tests.sh], [chmod ugo+x tests/performance/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])
+AC_CONFIG_FILES([examples/f03/run_tests.sh], [chmod ugo+x examples/f03/run_tests.sh])
 
 # Args:
 # 1. netcdf_meta.h variable

diff --git a/examples/f03/Makefile.am b/examples/f03/Makefile.am
@@ -22,7 +22,9 @@ TESTS = run_tests.sh
 endif # RUN_TESTS
 
 # Distribute the test script.
-EXTRA_DIST = CMakeLists.txt run_tests.sh
+EXTRA_DIST = CMakeLists.txt run_tests.sh.in
 
 # Clean up files produced during testing.
 CLEANFILES = *.nc *.log *.mod
+
+DISTCLEANFILES = run_tests.sh
diff --git a/examples/f03/run_tests.sh → examples/f03/run_tests.sh.in b/examples/f03/run_tests.sh → examples/f03/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