From 2f941bc90b05e2898f2b79e86639538156f4371a Mon Sep 17 00:00:00 2001 From: rem1776 Date: Fri, 6 Oct 2023 10:29:25 -0400 Subject: [PATCH] add r4 default flag to ci --- .github/workflows/github_autotools_gnu.yml | 2 +- configure.ac | 4 ++++ test_fms/mosaic2/Makefile.am | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github_autotools_gnu.yml b/.github/workflows/github_autotools_gnu.yml index e5f8c18321..00c7f5d31c 100644 --- a/.github/workflows/github_autotools_gnu.yml +++ b/.github/workflows/github_autotools_gnu.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - conf-flag: [ --disable-openmp, --disable-setting-flags, --with-mpi=no] + conf-flag: [ --disable-openmp, --disable-setting-flags, --with-mpi=no, --disable-r8-defaults] input-flag: [--with-yaml, --enable-test-input=/home/unit_tests_input] exclude: - conf-flag: --with-mpi=no diff --git a/configure.ac b/configure.ac index 9fddfe9503..59aebac24f 100644 --- a/configure.ac +++ b/configure.ac @@ -307,6 +307,10 @@ if test $enable_setting_flags = yes; then if test $enable_r8_default = yes; then GX_FC_DEFAULT_REAL_KIND8_FLAG([dnl FCFLAGS="$FCFLAGS $FC_DEFAULT_REAL_KIND8_FLAG"]) + AM_CONDITIONAL([SKIP_MOSAIC_TESTS], false) + else + # disable mosaic unit tests if FMS is compiled in r4 + AM_CONDITIONAL([SKIP_MOSAIC_TESTS], true) fi # individual mixed precision overloads diff --git a/test_fms/mosaic2/Makefile.am b/test_fms/mosaic2/Makefile.am index 3234f710b0..7f2d6143ab 100644 --- a/test_fms/mosaic2/Makefile.am +++ b/test_fms/mosaic2/Makefile.am @@ -50,6 +50,10 @@ EXTRA_DIST = test_mosaic2.sh # Run the test program. TESTS = test_mosaic2.sh +if SKIP_MOSAIC_TESTS + TESTS_ENVIRONMENT = SKIP_TESTS="test_mosaic2.1 test_mosaic2.2 test_mosaic2.3 test_mosaic2.4" +endif + TEST_EXTENSIONS = .sh SH_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ $(abs_top_srcdir)/test_fms/tap-driver.sh