From e835926b615e81b39bb66048683870d8a8c58ad4 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Fri, 28 Aug 2020 11:48:44 -0600 Subject: [PATCH] turning on fortran build in github CI, also fixing mpiexec in tests/performance --- .github/workflows/a4.yml | 2 +- configure.ac | 1 + tests/performance/Makefile.am | 4 +++- tests/performance/{run_tests.sh => run_tests.sh.in} | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) rename tests/performance/{run_tests.sh => run_tests.sh.in} (90%) diff --git a/.github/workflows/a4.yml b/.github/workflows/a4.yml index 3a20a8995e9..7d6f1071240 100644 --- 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 index ed92324e342..dfe781efa6e 100644 --- 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 index d63c58c4b9d..1841a80d80d 100644 --- 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 b/tests/performance/run_tests.sh.in similarity index 90% rename from tests/performance/run_tests.sh rename to tests/performance/run_tests.sh.in index 780ad7b791d..1dc6d25b628 100755 --- a/tests/performance/run_tests.sh +++ b/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