Merge commit '0585087c9230a8e8e30c00f463c62dbf547717c5'

This commit is contained in:
Darth Vader 2023-01-17 03:31:27 +00:00
commit ef0fddfc4a

View File

@ -275,12 +275,18 @@ add_test(NAME examples.ex22
COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex22 ex22.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex22.log COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex22 ex22.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex22.log
) )
# these take more than 600 seconds # Note when setting labels we can't use the following:
set(SKIP # 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 examples.ex21
) )
# disable tests that take too long # label tests that take too long
foreach(test ${SKIP}) foreach(test ${LONG_DEBUG})
set_tests_properties(${test} PROPERTIES DISABLED TRUE) set_property(TEST ${test} APPEND PROPERTY LABELS "long_debug")
set_property(TEST ${test} APPEND PROPERTY LABELS "long_memcheck")
endforeach() endforeach()