From 0585087c9230a8e8e30c00f463c62dbf547717c5 Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Tue, 17 Jan 2023 03:31:26 +0000 Subject: [PATCH] Squashed 'phreeqc3-examples/' changes from b674cfe5..4fbe69b0 4fbe69b0 [phreeqc3] Updated to split numdiff from memcheck added additional labels based on mytest/Makefile sorted lists in CMakeLists.txt files numdiff tests use Release builds git-subtree-dir: phreeqc3-examples git-subtree-split: 4fbe69b0b5e2b1d809367769096a79bffd027d48 --- CMakeLists.txt | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46fcfe2e..ef1dc5bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -275,12 +275,18 @@ add_test(NAME examples.ex22 COMMAND $ ${PROJECT_SOURCE_DIR}/examples/ex22 ex22.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex22.log ) -# these take more than 600 seconds -set(SKIP +# Note when setting labels we can't use the following: +# set_tests_properties(${test} PROPERTIES LABELS "pitzer") +# since it will overwrite any existing labels already set + +# long_debug +# > 600 seconds Debug +set(LONG_DEBUG examples.ex21 ) -# disable tests that take too long -foreach(test ${SKIP}) - set_tests_properties(${test} PROPERTIES DISABLED TRUE) +# label tests that take too long +foreach(test ${LONG_DEBUG}) + set_property(TEST ${test} APPEND PROPERTY LABELS "long_debug") + set_property(TEST ${test} APPEND PROPERTY LABELS "long_memcheck") endforeach()