From 8cb83c638986cb92139abea3389c60763ca85c4c Mon Sep 17 00:00:00 2001 From: Robert Chisholm Date: Tue, 17 Dec 2024 13:58:32 +0000 Subject: [PATCH] Update actions to run tests which aren't slow --- .github/workflows/Ubuntu.yml | 5 +++++ tests/physics/EI_cyl_160_fine/CMakeLists.txt | 2 ++ tests/physics/E_cyl_160_fine/CMakeLists.txt | 2 ++ tests/physics/sphere_63_120_mass/CMakeLists.txt | 2 ++ tests/physics/sphere_63_120_nomass/CMakeLists.txt | 2 ++ tests/physics/sphere_diffusion/CMakeLists.txt | 4 ++++ tests/rods/integration/connection/CMakeLists.txt | 1 + 7 files changed, 18 insertions(+) diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml index feb9b397..e02af935 100644 --- a/.github/workflows/Ubuntu.yml +++ b/.github/workflows/Ubuntu.yml @@ -114,3 +114,8 @@ jobs: path: ${{ env.BUILD_DIR }}/src/ffea_mb if-no-files-found: error retention-days: 5 + + - name: Run Tests (Slow Tests are Excluded) + if: ${{ env.CONFIG }} == "Release" + working-directory: ${{ env.BUILD_DIR }} + run: ctest -LE SLOW_TEST diff --git a/tests/physics/EI_cyl_160_fine/CMakeLists.txt b/tests/physics/EI_cyl_160_fine/CMakeLists.txt index fb11233a..d325f416 100644 --- a/tests/physics/EI_cyl_160_fine/CMakeLists.txt +++ b/tests/physics/EI_cyl_160_fine/CMakeLists.txt @@ -24,10 +24,12 @@ if(Python3_EXECUTABLE) add_test(NAME cyl_flexrig COMMAND ${PROJECT_BINARY_DIR}/src/ffea cyl_160_fine-EI.ffea) set_tests_properties(cyl_flexrig PROPERTIES ENVIRONMENT OMP_NUM_THREADS=1) + set_tests_properties(cyl_flexrig PROPERTIES LABELS "SLOW_TEST") add_test(NAME cyl_flexrig_check COMMAND ${Python3_EXECUTABLE} calcEI.py) set_tests_properties(cyl_flexrig_check PROPERTIES DEPENDS cyl_flexrig ENVIRONMENT_MODIFICATION PYTHONPATH=unset: ENVIRONMENT_MODIFICATION PYTHONHOME=unset:) + set_tests_properties(cyl_flexrig_check PROPERTIES LABELS "SLOW_TEST") endif() diff --git a/tests/physics/E_cyl_160_fine/CMakeLists.txt b/tests/physics/E_cyl_160_fine/CMakeLists.txt index 6bbf6390..19fec47a 100644 --- a/tests/physics/E_cyl_160_fine/CMakeLists.txt +++ b/tests/physics/E_cyl_160_fine/CMakeLists.txt @@ -25,9 +25,11 @@ if(Python3_EXECUTABLE) add_test(NAME cyl_youngs_mod COMMAND ${PROJECT_BINARY_DIR}/src/ffea cyl_160_fine-E.ffea) set_tests_properties(cyl_youngs_mod PROPERTIES ENVIRONMENT OMP_NUM_THREADS=1) +set_tests_properties(cyl_youngs_mod PROPERTIES LABELS "SLOW_TEST") add_test(NAME cyl_youngs_mod_check COMMAND ${Python3_EXECUTABLE} calcE.py) set_tests_properties(cyl_youngs_mod_check PROPERTIES DEPENDS cyl_youngs_mod ENVIRONMENT_MODIFICATION PYTHONPATH=unset: ENVIRONMENT_MODIFICATION PYTHONHOME=unset:) +set_tests_properties(cyl_youngs_mod_check PROPERTIES LABELS "SLOW_TEST") endif() \ No newline at end of file diff --git a/tests/physics/sphere_63_120_mass/CMakeLists.txt b/tests/physics/sphere_63_120_mass/CMakeLists.txt index 2b2c29fe..0925e1fc 100644 --- a/tests/physics/sphere_63_120_mass/CMakeLists.txt +++ b/tests/physics/sphere_63_120_mass/CMakeLists.txt @@ -24,6 +24,8 @@ if(Python3_EXECUTABLE) add_test(NAME sphere_mass COMMAND ${PROJECT_BINARY_DIR}/src/ffea sphere_63_120_mass.ffea) set_tests_properties(sphere_mass PROPERTIES ENVIRONMENT OMP_NUM_THREADS=1) + set_tests_properties(sphere_mass PROPERTIES LABELS "SLOW_TEST") add_test(NAME sphere_mass_check COMMAND ${Python3_EXECUTABLE} testAverages.py) set_tests_properties(sphere_mass_check PROPERTIES DEPENDS sphere_mass ENVIRONMENT_MODIFICATION PYTHONPATH=unset: ENVIRONMENT_MODIFICATION PYTHONHOME=unset:) + set_tests_properties(sphere_masscheck PROPERTIES LABELS "SLOW_TEST") endif() diff --git a/tests/physics/sphere_63_120_nomass/CMakeLists.txt b/tests/physics/sphere_63_120_nomass/CMakeLists.txt index b37f4dc8..cae4eaa4 100644 --- a/tests/physics/sphere_63_120_nomass/CMakeLists.txt +++ b/tests/physics/sphere_63_120_nomass/CMakeLists.txt @@ -25,8 +25,10 @@ if(Python3_EXECUTABLE) add_test(NAME sphere_nomass COMMAND ${PROJECT_BINARY_DIR}/src/ffea sphere_63_120_nomass.ffea) set_tests_properties(sphere_nomass PROPERTIES ENVIRONMENT OMP_NUM_THREADS=1) + set_tests_properties(sphere_nomass PROPERTIES LABELS "SLOW_TEST") add_test(NAME sphere_nomass_check COMMAND ${Python3_EXECUTABLE} testAverages.py) set_tests_properties(sphere_nomass_check PROPERTIES DEPENDS sphere_nomass ENVIRONMENT_MODIFICATION PYTHONPATH=unset: ENVIRONMENT_MODIFICATION PYTHONHOME=unset:) + set_tests_properties(sphere_nomass_check PROPERTIES LABELS "SLOW_TEST") endif() diff --git a/tests/physics/sphere_diffusion/CMakeLists.txt b/tests/physics/sphere_diffusion/CMakeLists.txt index 28f47391..9e0f1777 100644 --- a/tests/physics/sphere_diffusion/CMakeLists.txt +++ b/tests/physics/sphere_diffusion/CMakeLists.txt @@ -29,15 +29,19 @@ if(Python3_EXECUTABLE) add_test(NAME sphere_diffusion_nomass COMMAND ${PROJECT_BINARY_DIR}/src/ffea sphere_nomass_norestart.ffea) set_tests_properties(sphere_diffusion_nomass PROPERTIES ENVIRONMENT OMP_NUM_THREADS=1) + set_tests_properties(sphere_diffusion_nomass PROPERTIES LABELS "SLOW_TEST") add_test(NAME sphere_diffusion_nomass_check COMMAND ${Python3_EXECUTABLE} diffusion_nomass.py sphere_nomass_norestart.ffea) set_tests_properties(sphere_diffusion_nomass_check PROPERTIES DEPENDS sphere_diffusion_nomass ENVIRONMENT_MODIFICATION PYTHONPATH=unset: ENVIRONMENT_MODIFICATION PYTHONHOME=unset:) + set_tests_properties(sphere_diffusion_nomass_check PROPERTIES LABELS "SLOW_TEST") add_test(NAME sphere_diffusion_mass COMMAND ${PROJECT_BINARY_DIR}/src/ffea sphere_mass_norestart.ffea) set_tests_properties(sphere_diffusion_mass PROPERTIES ENVIRONMENT OMP_NUM_THREADS=1) + set_tests_properties(sphere_diffusion_mass PROPERTIES LABELS "SLOW_TEST") add_test(NAME sphere_diffusion_mass_check COMMAND ${Python3_EXECUTABLE} diffusion_mass.py sphere_mass_norestart.ffea) set_tests_properties(sphere_diffusion_mass_check PROPERTIES DEPENDS sphere_diffusion_mass ENVIRONMENT_MODIFICATION PYTHONPATH=unset: ENVIRONMENT_MODIFICATION PYTHONHOME=unset:) + set_tests_properties(sphere_diffusion_mass_check PROPERTIES LABELS "SLOW_TEST") endif() diff --git a/tests/rods/integration/connection/CMakeLists.txt b/tests/rods/integration/connection/CMakeLists.txt index f7fed4fc..f161edbf 100644 --- a/tests/rods/integration/connection/CMakeLists.txt +++ b/tests/rods/integration/connection/CMakeLists.txt @@ -29,4 +29,5 @@ file (COPY bend.ffea DESTINATION ${CONNECTIONPROPDIR}) file (COPY twist.ffea DESTINATION ${CONNECTIONPROPDIR}) add_subdirectory(sphere_structure) add_test(NAME connection_propagation COMMAND ${PROJECT_BINARY_DIR}/src/ffea connection_propagation.ffeatest) +set_tests_properties(connection_propagation PROPERTIES LABELS "SLOW_TEST")