Fix broken ci

MinsukJi-NOAA · Feb 12, 2021 · 6a6721c · 6a6721c
1 parent c3c0502
commit 6a6721c
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -149,6 +149,14 @@ list(APPEND _fms_defs_public use_libMPI
 if(QUAD_PRECISION)
   list(APPEND _fms_defs_public ENABLE_QUAD_PRECISION)
 endif()
+
+# check gettid
+include(CheckFunctionExists)
+check_function_exists(gettid HAVE_GETTID)
+if(HAVE_GETTID)
+  list(APPEND _fms_defs_public HAVE_GETTID)
+endif()
+
 target_compile_definitions(fms PUBLIC "${_fms_defs_public}")
 
 if(32BIT)

diff --git a/tests/ci/ci.sh b/tests/ci/ci.sh
@@ -63,8 +63,6 @@ fi
 
 if [ $BUILD = "true" ]; then
 
-  sed -i -e '/affinity.c/d' ../../CMakeLists.txt
-
   sudo docker build --build-arg test_name=$TEST_NAME \
                     --build-arg build_case=$BUILD_CASE \
                     --no-cache \

diff --git a/tests/utest.bld b/tests/utest.bld
@@ -1,22 +1,22 @@
-fv3_ccpp_control              | CCPP=Y SUITES=FV3_GFS_2017
-fv3_ccpp_wrtGauss_netcdf_esmf | CCPP=Y SUITES=FV3_GFS_2017
-fv3_ccpp_wrtGauss_netcdf      | CCPP=Y SUITES=FV3_GFS_2017
-fv3_ccpp_wrtGlatlon_netcdf    | CCPP=Y SUITES=FV3_GFS_2017
-fv3_ccpp_wrtGauss_nemsio      | CCPP=Y SUITES=FV3_GFS_2017
-fv3_ccpp_stochy               | CCPP=Y SUITES=FV3_GFS_2017
-fv3_ccpp_iau                  | CCPP=Y SUITES=FV3_GFS_2017
-fv3_ccpp_ca                   | CCPP=Y SUITES=FV3_GFS_2017
-fv3_ccpp_lheatstrg            | CCPP=Y SUITES=FV3_GFS_2017
-fv3_ccpp_gfdlmprad            | CCPP=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y
-fv3_ccpp_atmwav               | CCPP=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y
-fv3_ccpp_multigases           | CCPP=Y SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y
-fv3_ccpp_gfdlmp               | CCPP=Y SUITES=FV3_GFS_2017_gfdlmp
-fv3_ccpp_gfdlmprad_gwd        | CCPP=Y SUITES=FV3_GFS_2017_gfdlmp
-fv3_ccpp_gfdlmprad_noahmp     | CCPP=Y SUITES=FV3_GFS_2017_gfdlmp_noahmp
-fv3_ccpp_csawmg               | CCPP=Y SUITES=FV3_GFS_2017_csawmg
-fv3_ccpp_satmedmf             | CCPP=Y SUITES=FV3_GFS_2017_satmedmf
-fv3_ccpp_satmedmfq            | CCPP=Y SUITES=FV3_GFS_2017_satmedmfq
-fv3_ccpp_gfsv16_csawmg        | CCPP=Y SUITES=FV3_GFS_v16_csawmg
-fv3_ccpp_gfsv16_csawmgt       | CCPP=Y SUITES=FV3_GFS_v16_csawmg
-fv3_ccpp_gocart_clm           | CCPP=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
-fv3_ccpp_gfs_v16_flake        | CCPP=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
+fv3_ccpp_control              | SUITES=FV3_GFS_2017
+fv3_ccpp_wrtGauss_netcdf_esmf | SUITES=FV3_GFS_2017
+fv3_ccpp_wrtGauss_netcdf      | SUITES=FV3_GFS_2017
+fv3_ccpp_wrtGlatlon_netcdf    | SUITES=FV3_GFS_2017
+fv3_ccpp_wrtGauss_nemsio      | SUITES=FV3_GFS_2017
+fv3_ccpp_stochy               | SUITES=FV3_GFS_2017
+fv3_ccpp_iau                  | SUITES=FV3_GFS_2017
+fv3_ccpp_ca                   | SUITES=FV3_GFS_2017
+fv3_ccpp_lheatstrg            | SUITES=FV3_GFS_2017
+fv3_ccpp_gfdlmprad            | SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y
+fv3_ccpp_atmwav               | SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y
+fv3_ccpp_multigases           | SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y
+fv3_ccpp_gfdlmp               | SUITES=FV3_GFS_2017_gfdlmp
+fv3_ccpp_gfdlmprad_gwd        | SUITES=FV3_GFS_2017_gfdlmp
+fv3_ccpp_gfdlmprad_noahmp     | SUITES=FV3_GFS_2017_gfdlmp_noahmp
+fv3_ccpp_csawmg               | SUITES=FV3_GFS_2017_csawmg
+fv3_ccpp_satmedmf             | SUITES=FV3_GFS_2017_satmedmf
+fv3_ccpp_satmedmfq            | SUITES=FV3_GFS_2017_satmedmfq
+fv3_ccpp_gfsv16_csawmg        | SUITES=FV3_GFS_v16_csawmg
+fv3_ccpp_gfsv16_csawmgt       | SUITES=FV3_GFS_v16_csawmg
+fv3_ccpp_gocart_clm           | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
+fv3_ccpp_gfs_v16_flake        | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake