From 375f4c02b50f6819a9632fe24c8082f7d29adc50 Mon Sep 17 00:00:00 2001 From: Katharina Heck <katharina.heck@iws.uni-stuttgart.de> Date: Wed, 29 Aug 2018 15:29:47 +0200 Subject: [PATCH] [cleanup][cmakelists] reuse executable in 2p2c and 2pncmin --- test/porousmediumflow/2p2c/implicit/CMakeLists.txt | 7 ++----- test/porousmediumflow/2pncmin/implicit/CMakeLists.txt | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/test/porousmediumflow/2p2c/implicit/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/CMakeLists.txt index cb6d43b971..8e2cc2a3c2 100644 --- a/test/porousmediumflow/2p2c/implicit/CMakeLists.txt +++ b/test/porousmediumflow/2p2c/implicit/CMakeLists.txt @@ -1,12 +1,9 @@ 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 - TARGET test_2p2c_box + SOURCES test_2p2c_fv.cc + COMPILE_DEFINITIONS TYPETAG=InjectionBoxTypeTag ENABLECACHING=0 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/injectionbox-reference.vtu diff --git a/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt b/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt index 20c5776b64..a9bde50433 100644 --- a/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt +++ b/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt @@ -1,11 +1,9 @@ dune_symlink_to_source_files(FILES test_2pncmin.input) -add_executable(test_2pncmin_box EXCLUDE_FROM_ALL test_2pncmin_fv.cc) -target_compile_definitions(test_2pncmin_box PUBLIC TYPETAG=DissolutionBoxTypeTag) - # isothermal tests dune_add_test(NAME test_2pncmin_box - TARGET test_2pncmin_box + SOURCES test_2pncmin_fv.cc + COMPILE_DEFINITIONS TYPETAG=DissolutionBoxTypeTag COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/saltflushbox2pncmin-reference.vtu -- GitLab