Add dummy library target for system test registration

This satisfies dune-testtools which requires a target with location
for its functon `dune_add_system_test`.
parent 48133574
......@@ -127,7 +127,6 @@ build:system-tests: &build-tests
$DUNECONTROL --only=dorie configure
- $DUNECONTROL --only=dorie make $MAKE_FLAGS dorie-rfg
- $DUNECONTROL --only=dorie make $MAKE_FLAGS build_system_tests
- $DUNECONTROL --only=dorie make doc
artifacts:
name: "$CI_JOB_NAME"
paths:
......
......@@ -161,6 +161,7 @@
* Solver in `RichardsSimulation` was using the wrong time variable.
[!116](https://ts-gitlab.iup.uni-heidelberg.de/dorie/dorie/merge_requests/116)
* Shape of input datasets was flipped when loading scaling factors !124
* `dune_add_system_test` requires target with location after bugfix !165
### Deprecated
* The configuration file key `[parameters.interpolation]` is deprecated due to
......
......@@ -18,6 +18,11 @@ add_custom_target(prepare_testing
add_dependencies(system_tests prepare_testing)
add_dependencies(unit_tests prepare_testing)
# Create a fake library target to satisfy dune-testtools
add_library(dorie_test UNKNOWN IMPORTED)
set_property(TARGET dorie_test
PROPERTY IMPORTED_LOCATION ${PROJECT_BINARY_DIR}/activate)
#
# .. cmake_function:: add_coverage_links
#
......
message(STATUS "Handling system tests")
# dorie run: ODE tests
dorie_add_metaini_test(TARGET dorie METAINI ode_homogeneous_sand.mini.in)
dorie_add_metaini_test(TARGET dorie METAINI ode_homogeneous_silt.mini.in)
dorie_add_metaini_test(TARGET dorie METAINI ode_layered.mini.in)
dorie_add_metaini_test(TARGET dorie_test METAINI ode_homogeneous_sand.mini.in)
dorie_add_metaini_test(TARGET dorie_test METAINI ode_homogeneous_silt.mini.in)
dorie_add_metaini_test(TARGET dorie_test METAINI ode_layered.mini.in)
# add target for ODE tests
add_custom_target(test_run_ode
......@@ -12,7 +11,7 @@ add_custom_target(test_run_ode
add_dependencies(test_run_ode prepare_testing)
# dorie run: constant quantity tests
dorie_add_metaini_test(TARGET dorie METAINI const_solute.mini.in)
dorie_add_metaini_test(TARGET dorie_test METAINI const_solute.mini.in)
# add target for constant transport tests
add_custom_target(test_run_const
......@@ -20,39 +19,39 @@ add_custom_target(test_run_const
add_dependencies(test_run_const prepare_testing)
# dorie run: Reference tests
dorie_add_metaini_test(TARGET dorie METAINI muphi.mini.in)
dorie_add_metaini_test(TARGET dorie_test METAINI muphi.mini.in)
add_custom_target(test_run_ref
COMMAND ctest --output-on-failure --tests-regex ^.+_ref_.+$
)
# dorie_add_metaini_test(TARGET dorie METAINI reference_2d.mini.in)
# dorie_add_metaini_test(TARGET dorie METAINI reference_3d.mini.in)
# dorie_add_metaini_test(TARGET dorie METAINI reference_evaporation.mini.in)
# dorie_add_metaini_test(TARGET dorie METAINI reference_interpolators.mini.in)
# dorie_add_metaini_test(TARGET dorie_test METAINI reference_2d.mini.in)
# dorie_add_metaini_test(TARGET dorie_test METAINI reference_3d.mini.in)
# dorie_add_metaini_test(TARGET dorie_test METAINI reference_evaporation.mini.in)
# dorie_add_metaini_test(TARGET dorie_test METAINI reference_interpolators.mini.in)
# dorie in parallel
dorie_add_metaini_test(TARGET dorie METAINI parallel_reference.mini.in)
dorie_add_metaini_test(TARGET dorie METAINI parallel_reference_compare.mini.in)
dorie_add_metaini_test(TARGET dorie_test METAINI parallel_reference.mini.in)
dorie_add_metaini_test(TARGET dorie_test METAINI parallel_reference_compare.mini.in)
set_tests_properties(dorie_parallel_reference PROPERTIES FIXTURES_SETUP dorie_par)
set_tests_properties(dorie_parallel_reference_compare_0000 PROPERTIES FIXTURES_REQUIRED dorie_par)
set_tests_properties(dorie_parallel_reference_compare_0001 PROPERTIES FIXTURES_REQUIRED dorie_par)
set_tests_properties(dorie_test_parallel_reference PROPERTIES FIXTURES_SETUP dorie_par)
set_tests_properties(dorie_test_parallel_reference_compare_0000 PROPERTIES FIXTURES_REQUIRED dorie_par)
set_tests_properties(dorie_test_parallel_reference_compare_0001 PROPERTIES FIXTURES_REQUIRED dorie_par)
add_custom_target(test_run_parallel
COMMAND ctest --output-on-failure --tests-regex ^dorie_parallel_.+$
COMMAND ctest --output-on-failure --tests-regex ^dorie_test_parallel_.+$
)
add_dependencies(test_run_parallel prepare_testing)
# dorie exec tests
dorie_add_metaini_test(TARGET dorie METAINI pfg.mini.in)
dorie_add_metaini_test(TARGET dorie METAINI run.mini.in)
dorie_add_metaini_test(TARGET dorie_test METAINI pfg.mini.in)
dorie_add_metaini_test(TARGET dorie_test METAINI run.mini.in)
dorie_add_metaini_test(TARGET dorie METAINI plot.mini.in)
set_tests_properties(dorie_exec_run PROPERTIES FIXTURES_SETUP dorie_plot)
set_tests_properties(dorie_exec_plot PROPERTIES FIXTURES_REQUIRED dorie_plot)
dorie_add_metaini_test(TARGET dorie_test METAINI plot.mini.in)
set_tests_properties(dorie_test_exec_run PROPERTIES FIXTURES_SETUP dorie_plot)
set_tests_properties(dorie_test_exec_plot PROPERTIES FIXTURES_REQUIRED dorie_plot)
dorie_add_metaini_test(TARGET dorie METAINI create.mini.in)
dorie_add_metaini_test(TARGET dorie_test METAINI create.mini.in)
add_custom_target(test_dorie_exec
COMMAND ctest --output-on-failure --tests-regex ^.+_exec.+$
......@@ -70,7 +69,7 @@ add_custom_target(test_mass_conservation
COMMAND ctest --output-on-failure --tests-regex ^.+mass-conservation.+$
)
dorie_add_metaini_test(TARGET dorie METAINI conforming_flux_jumps.mini.in)
dorie_add_metaini_test(TARGET dorie_test METAINI conforming_flux_jumps.mini.in)
# add target for ODE tests
add_custom_target(test_conforming_flux_jumps
......@@ -78,7 +77,9 @@ add_custom_target(test_conforming_flux_jumps
add_dependencies(test_run_ode prepare_testing)
# Build the application for the system tests
add_dependencies(build_system_tests dorie)
# 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_test PROPERTY EXCLUDE_FROM_ALL 0)
set_property(TARGET dorie-rfg PROPERTY EXCLUDE_FROM_ALL 0)
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