From 2382ba2b57cc000e958ba5ad300505384a99500b Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Wed, 11 Jul 2018 08:45:19 +0200 Subject: [PATCH] [test][restart] Use only one executable for normal and restart test --- test/porousmediumflow/2p2c/implicit/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/porousmediumflow/2p2c/implicit/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/CMakeLists.txt index bfa0832d54..da8153e194 100644 --- a/test/porousmediumflow/2p2c/implicit/CMakeLists.txt +++ b/test/porousmediumflow/2p2c/implicit/CMakeLists.txt @@ -2,9 +2,11 @@ add_subdirectory(mpnccomparison) add_input_file_links() # isothermal tests without caching +add_executable(test_2p2c_box EXCLUDE_FROM_ALL test_2p2c_fv.cc) +target_compile_definitions(test_2p2c_box PUBLIC TYPETAG=InjectionBoxTypeTag ENABLECACHING=0) + dune_add_test(NAME test_2p2c_box - SOURCES test_2p2c_fv.cc - COMPILE_DEFINITIONS TYPETAG=InjectionBoxTypeTag ENABLECACHING=0 + TARGET test_2p2c_box COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/injectionbox-reference.vtu @@ -12,13 +14,12 @@ dune_add_test(NAME test_2p2c_box --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_box test_2p2c_fv.input -Problem.Name injection_box") dune_add_test(NAME test_2p2c_box_restart - SOURCES test_2p2c_fv.cc - COMPILE_DEFINITIONS TYPETAG=InjectionBoxTypeTag ENABLECACHING=0 + TARGET test_2p2c_box COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/injectionbox-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/injection_box_restart-00004.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_box_restart test_2p2c_fv.input -Problem.Name injection_box_restart -TimeLoop.DtInitial 1488.5 -Restart.Time 2158.85 -Restart.File injection_box-00004.vtu") + --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_box test_2p2c_fv.input -Problem.Name injection_box_restart -TimeLoop.DtInitial 1488.5 -Restart.Time 2158.85 -Restart.File injection_box-00004.vtu") dune_add_test(NAME test_2p2c_tpfa SOURCES test_2p2c_fv.cc -- GitLab