Add ESSENTIAL label

GEOS-ESM · Mar 18, 2024 · f6c7d4a · f6c7d4a
1 parent 7764546
commit f6c7d4a
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -39,7 +39,7 @@ workflows:
           repo: MAPL
           mepodevelop: false
           run_unit_tests: true
-          ctest_options: "-LE 'PERFORMANCE|EXTDATA1G_BIG_TESTS|EXTDATA2G_BIG_TESTS' --output-on-failure"
+          ctest_options: "-L 'ESSENTIAL' --output-on-failure"
           persist_workspace: true # Needed for MAPL tutorials
 
       # Builds MAPL in a "default" way - GNU
@@ -65,7 +65,7 @@ workflows:
           repo: MAPL
           mepodevelop: false
           run_unit_tests: true
-          ctest_options: "-E bundleio -LE 'PERFORMANCE|EXTDATA1G_BIG_TESTS|EXTDATA2G_BIG_TESTS' --output-on-failure"
+          ctest_options: "-E bundleio -L 'ESSENTIAL' --output-on-failure"
           persist_workspace: true # Needed for MAPL tutorials
 
       # Builds MAPL like UFS does (no FLAP and pFlogger, static)
@@ -83,7 +83,7 @@ workflows:
           remove_pflogger: true
           extra_cmake_options: "-DBUILD_WITH_FLAP=OFF -DBUILD_WITH_PFLOGGER=OFF -DBUILD_WITH_FARGPARSE=OFF -DUSE_EXTDATA2G=OFF -DBUILD_SHARED_MAPL=OFF"
           run_unit_tests: true
-          ctest_options: "-LE 'PERFORMANCE|EXTDATA1G_BIG_TESTS|EXTDATA2G_BIG_TESTS' --output-on-failure"
+          ctest_options: "-L 'ESSENTIAL' --output-on-failure"
 
       # Run MAPL Tutorials
       - ci/run_mapl_tutorial:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,10 +31,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - The MAPL\_ESMFRegridder manage now does compute the transpose by default
 - Bypassed the I-Server reading call when there is no extdata
+- Created new `ESSENTIAL` ctest label for tests that must pass for a release
+  - These are "simple" quick tests that don't require a lot of resources
+  - With ESMA_cmake v3.43.0, `make tests` will only run tests with the `ESSENTIAL` label. To run all tests, use `make tests-all`
 - Update `components.yaml`
-  - ESMA_cmake v3.42.0
+  - ESMA_cmake v3.43.0
     - Updates to MPI detection
     - Enable `-quiet` flag for NAG
+    - `make tests` now only runs tests with the `ESSENTIAL` label. To run all tests, use `make tests-all`
 
 ### Fixed
 

diff --git a/Tests/ExtData_Testing_Framework/CMakeLists.txt b/Tests/ExtData_Testing_Framework/CMakeLists.txt
@@ -17,9 +17,9 @@ foreach(TEST_CASE ${TEST_CASES_1G})
   endif()
   add_test(
      NAME "ExtData1G_${TEST_CASE}"
-     COMMAND ${CMAKE_COMMAND} 
-       -DTEST_CASE=${TEST_CASE} 
-       -DMPIEXEC_EXECUTABLE=${MPIEXEC_EXECUTABLE} 
+     COMMAND ${CMAKE_COMMAND}
+       -DTEST_CASE=${TEST_CASE}
+       -DMPIEXEC_EXECUTABLE=${MPIEXEC_EXECUTABLE}
        -DMPIEXEC_NUMPROC_FLAG=${MPIEXEC_NUMPROC_FLAG}
        -DMY_BINARY_DIR=${CMAKE_BINARY_DIR}/bin
        -DMPIEXEC_PREFLAGS=${MPIEXEC_PREFLAGS}
@@ -28,6 +28,7 @@ foreach(TEST_CASE ${TEST_CASES_1G})
        )
   if (${num_procs} LESS ${cutoff})
      set_tests_properties ("ExtData1G_${TEST_CASE}" PROPERTIES LABELS "EXTDATA1G_SMALL_TESTS")
+     set_tests_properties ("ExtData1G_${TEST_CASE}" PROPERTIES LABELS "ESSENTIAL")
   else()
      set_tests_properties ("ExtData1G_${TEST_CASE}" PROPERTIES LABELS "EXTDATA1G_BIG_TESTS")
   endif()
@@ -37,17 +38,17 @@ endforeach()
 file(STRINGS "test_cases/extdata_2g_cases.txt" TEST_CASES_2G)
 
 foreach(TEST_CASE ${TEST_CASES_2G})
-     
+
   if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/test_cases/${TEST_CASE}/nproc.rc)
      file(READ ${CMAKE_CURRENT_LIST_DIR}/test_cases/${TEST_CASE}/nproc.rc num_procs)
   else()
      set(num_procs "1")
   endif()
   add_test(
      NAME "ExtData2G_${TEST_CASE}"
-     COMMAND ${CMAKE_COMMAND} 
-       -DTEST_CASE=${TEST_CASE} 
-       -DMPIEXEC_EXECUTABLE=${MPIEXEC_EXECUTABLE} 
+     COMMAND ${CMAKE_COMMAND}
+       -DTEST_CASE=${TEST_CASE}
+       -DMPIEXEC_EXECUTABLE=${MPIEXEC_EXECUTABLE}
        -DMPIEXEC_NUMPROC_FLAG=${MPIEXEC_NUMPROC_FLAG}
        -DMY_BINARY_DIR=${CMAKE_BINARY_DIR}/bin
        -DMPIEXEC_PREFLAGS=${MPIEXEC_PREFLAGS}
@@ -56,6 +57,7 @@ foreach(TEST_CASE ${TEST_CASES_2G})
      )
   if (${num_procs} LESS ${cutoff})
      set_tests_properties ("ExtData2G_${TEST_CASE}" PROPERTIES LABELS "EXTDATA2G_SMALL_TESTS")
+     set_tests_properties ("ExtData2G_${TEST_CASE}" PROPERTIES LABELS "ESSENTIAL")
   else()
      set_tests_properties ("ExtData2G_${TEST_CASE}" PROPERTIES LABELS "EXTDATA2G_BIG_TESTS")
   endif()

diff --git a/base/tests/CMakeLists.txt b/base/tests/CMakeLists.txt
@@ -45,6 +45,7 @@ add_pfunit_ctest(MAPL.base.tests
                 MAX_PES 8
                 )
 set_target_properties(MAPL.base.tests PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY})
+set_tests_properties(MAPL.base.tests PROPERTIES LABELS "ESSENTIAL")
 
 add_dependencies(build-tests MAPL.base.tests)
 

diff --git a/components.yaml b/components.yaml
@@ -11,7 +11,7 @@ ESMA_env:
 ESMA_cmake:
   local: ./ESMA_cmake
   remote: ../ESMA_cmake.git
-  tag: v3.42.0
+  tag: v3.43.0
   develop: develop
 
 ecbuild:

diff --git a/field_utils/tests/CMakeLists.txt b/field_utils/tests/CMakeLists.txt
@@ -16,6 +16,7 @@ add_pfunit_ctest(MAPL.field_utils.tests
                 MAX_PES 4
                 )
 set_target_properties(MAPL.field_utils.tests PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY})
+set_tests_properties(MAPL.field_utils.tests PROPERTIES LABELS "ESSENTIAL")
 
 if (APPLE)
   set(LD_PATH "DYLD_LIBRARY_PATH")

diff --git a/generic/tests/CMakeLists.txt b/generic/tests/CMakeLists.txt
@@ -15,5 +15,6 @@ add_pfunit_ctest(MAPL.generic.tests
                 MAX_PES 1
                 )
 set_target_properties(MAPL.generic.tests PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY})
+set_tests_properties(MAPL.generic.tests PROPERTIES LABELS "ESSENTIAL")
 
 add_dependencies(build-tests MAPL.generic.tests)
diff --git a/pfio/tests/CMakeLists.txt b/pfio/tests/CMakeLists.txt
@@ -45,6 +45,7 @@ add_pfunit_ctest(MAPL.pfio.tests
                 MAX_PES 8
                 )
 set_target_properties(MAPL.pfio.tests PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY})
+set_tests_properties(MAPL.pfio.tests PROPERTIES LABELS "ESSENTIAL")
 
 include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/profiler/tests/CMakeLists.txt b/profiler/tests/CMakeLists.txt
@@ -22,6 +22,7 @@ add_pfunit_ctest (
   MAX_PES 8
   )
 set_target_properties(MAPL.profiler.tests PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY})
-
+set_tests_properties(MAPL.profiler.tests PROPERTIES LABELS "ESSENTIAL")
+
 add_dependencies (build-tests MAPL.profiler.tests)
 
diff --git a/shared/tests/CMakeLists.txt b/shared/tests/CMakeLists.txt
@@ -16,5 +16,6 @@ add_pfunit_ctest(MAPL.shared.tests
                 LINK_LIBRARIES MAPL.shared
                 )
 set_target_properties(MAPL.shared.tests PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY})
+set_tests_properties(MAPL.shared.tests PROPERTIES LABELS "ESSENTIAL")
 
 add_dependencies(build-tests MAPL.shared.tests)