The TS-GitLab will have to shut down in the near future — please plan migrating your projects to GitLab.com or GitHub. Contact @yunus for more information.

Commit 643599fd authored by Lukas Riedel's avatar Lukas Riedel 🎧
Browse files

Change handling of system test targets

- unset DUNE_BUILD_TESTS_ON_MAKE_ALL
- add test-mass-conservation as regular executable
- remove EXCLUDE_FROM_ALL property of from test targets explicitly
parent 18f13018
......@@ -32,9 +32,6 @@ dune_project()
dune_enable_all_packages()
dune_require_cxx_standard(MODULE "dorie" VERSION 14)
# avoid the executables from being 'excluded from all'
set(DUNE_BUILD_TESTS_ON_MAKE_ALL TRUE)
# add subdirectories
add_subdirectory("bin")
add_subdirectory("m4")
......
add_executable("test-mass-conservation" test-mass-conservation.cc)
dune_target_link_libraries(test-mass-conservation ${DUNE_LIBS})
\ No newline at end of file
......@@ -27,17 +27,6 @@ dorie_add_system_test(dorie reference_3d.mini)
dorie_add_system_test(dorie reference_evaporation.mini)
dorie_add_system_test(dorie reference_interpolators.mini)
# dorie mass conservation
configure_file(mass_conservation.mini.in ${CMAKE_CURRENT_SOURCE_DIR}/mass_conservation.mini)
dune_add_system_test(
SOURCE ${PROJECT_SOURCE_DIR}/dune/dorie/test/test-mass-conservation.cc
# TARGET test-mass-conservation # ${PROJECT_BINARY_DIR}/dune/dorie/dorie/test/
BASENAME test-mass-conservation
INIFILE mass_conservation.mini
CREATED_TARGETS target)
dune_target_link_libraries(${target} ${DUNE_LIBS})
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
# dorie in parallel
dorie_add_system_test(dorie parallel_reference.mini)
dorie_add_system_test(dorie parallel_reference_compare.mini)
......@@ -46,6 +35,11 @@ dorie_add_system_test_dependency(dorie_parallel_reference_compare_0001 dorie_par
dorie_add_system_test_dependency(dorie_parallel_reference_compare_0002 dorie_parallel_reference_0001)
dorie_add_system_test_dependency(dorie_parallel_reference_compare_0003 dorie_parallel_reference_0001)
# dorie mass conservation
configure_file(mass_conservation.mini.in ${CMAKE_CURRENT_SOURCE_DIR}/mass_conservation.mini)
dune_add_system_test(TARGET test-mass-conservation
INIFILE mass_conservation.mini)
# dorie pfg
dorie_add_system_test(dorie-rfg parfield.mini)
dorie_add_system_test(dorie-rfg parfield_muphi.mini)
......@@ -58,3 +52,7 @@ dorie_add_system_test_dependency(dorie_plot dorie_reference_2d_0000)
# dorie create
dorie_add_system_test(dorie create.mini)
# dune excludes test targets from 'make all'; undo that here where applicable
set_property(TARGET dorie PROPERTY EXCLUDE_FROM_ALL 0)
set_property(TARGET dorie-rfg PROPERTY EXCLUDE_FROM_ALL 0)
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment