From 403ae53f48fc870577ca27dc9044a23887271193 Mon Sep 17 00:00:00 2001 From: Dmitri Naumov <dmitri.naumov@ufz.de> Date: Mon, 12 Aug 2024 17:41:12 +0200 Subject: [PATCH] [ci] Restrict omp tests to TRM; exclude TRF --- scripts/cmake/test/AddTest.cmake | 4 ++-- scripts/cmake/test/OgsTest.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake index 104027437f3..0ab5b41d5d8 100644 --- a/scripts/cmake/test/AddTest.cmake +++ b/scripts/cmake/test/AddTest.cmake @@ -292,7 +292,7 @@ function(AddTest) # OpenMP tests for specific processes only. TODO (CL) Once all processes can # be assembled OpenMP parallel, the condition should be removed. - if("${labels}" MATCHES "TH2M|ThermoRichards|^HydroMechanics") + if("${labels}" MATCHES "TH2M|ThermoRichardsMechanics|^HydroMechanics") _add_test(${TEST_NAME}-omp) _set_omp_test_properties() endif() @@ -323,7 +323,7 @@ function(AddTest) # Run the tester _add_test_tester(${TEST_NAME}) - if("${labels}" MATCHES "TH2M|ThermoRichards|^HydroMechanics") + if("${labels}" MATCHES "TH2M|ThermoRichardsMechanics|^HydroMechanics") _add_test_tester(${TEST_NAME}-omp) endif() diff --git a/scripts/cmake/test/OgsTest.cmake b/scripts/cmake/test/OgsTest.cmake index 6a408e0ba88..8449f9d5b37 100644 --- a/scripts/cmake/test/OgsTest.cmake +++ b/scripts/cmake/test/OgsTest.cmake @@ -84,7 +84,7 @@ function(OgsTest) # OpenMP tests for specific processes only. TODO (CL) Once all processes can # be assembled OpenMP parallel, the condition should be removed. - if("${labels}" MATCHES "TH2M|ThermoRichards|^HydroMechanics") + if("${labels}" MATCHES "TH2M|ThermoRichardsMechanics|^HydroMechanics") _ogs_add_test(${TEST_NAME}-omp) _set_omp_test_properties() endif() -- GitLab