turning on fortran build in github CI, also fixing mpiexec in tests/p…

…erformance
jedwards4b · Aug 28, 2020 · e835926 · e835926
1 parent a5fb922
commit e835926
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/a4.yml b/.github/workflows/a4.yml
@@ -125,6 +125,6 @@ jobs:
         source .bashrc
         export CC=/home/runner/mpich/bin/mpicc
         autoreconf -i
-        ./configure
+        ./configure --enable-fortran
         make -j check
         
diff --git a/configure.ac b/configure.ac
@@ -405,6 +405,7 @@ AC_CONFIG_FILES([tests/ncint/run_tests.sh], [chmod ugo+x tests/ncint/run_tests.s
 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/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])
 

diff --git a/tests/performance/Makefile.am b/tests/performance/Makefile.am
@@ -33,7 +33,9 @@ TESTS = run_tests.sh
 endif # RUN_TESTS
 
 EXTRA_DIST = CMakeLists.txt gensimple.pl Pioperformance.md pioperf.nl	\
-run_tests.sh
+run_tests.sh.in
 
 # Clean up files produced during testing.
 CLEANFILES = *.nc *.log *.mod
+
+DISTCLEANFILES = run_tests.sh
diff --git a/tests/performance/run_tests.sh → tests/performance/run_tests.sh.in b/tests/performance/run_tests.sh → tests/performance/run_tests.sh.in
@@ -17,7 +17,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