From 22b1cc1bd16dcd5b9acce31692088be966111aaf Mon Sep 17 00:00:00 2001 From: Santiago Ospina Date: Wed, 5 Sep 2018 23:01:44 +0200 Subject: [PATCH] moved transport cc to test meanwhile we define a proper interface --- dune/dorie/CMakeLists.txt | 8 +------- test/CMakeLists.txt | 12 ++++++++++++ dune/dorie/transport.cc => test/test-transport.cc | 6 +++--- test/test-transport.mini.in | 0 4 files changed, 16 insertions(+), 10 deletions(-) rename dune/dorie/transport.cc => test/test-transport.cc (97%) create mode 100644 test/test-transport.mini.in diff --git a/dune/dorie/CMakeLists.txt b/dune/dorie/CMakeLists.txt index c80cb2ae..a9c07d2d 100644 --- a/dune/dorie/CMakeLists.txt +++ b/dune/dorie/CMakeLists.txt @@ -9,10 +9,4 @@ dune_target_link_libraries(dorie dorie-impl ${DUNE_LIBS}) # enable setting operator scheme from config file if(EXPERIMENTAL_DG_FEATURES) target_compile_definitions("dorie" PUBLIC -DEXPERIMENTAL_DG_FEATURES) -endif() - -dune_add_test(SOURCES transport.cc NAME test_transport) - -add_custom_target(build_test_transport - DEPENDS test_transport -) +endif() \ No newline at end of file diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 700ffa0b..636db8a6 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -79,6 +79,18 @@ add_custom_target(test_param COMMAND ctest --output-on-failure --tests-regex ^.+test-parameterization_.+$ ) +# TEMPORAL trasport test +dorie_add_metaini_test(UNIT_TEST + SOURCE test-transport.cc + BASENAME test-transport + CREATED_TARGETS test-transport + METAINI test-transport.mini.in + SCRIPT +) +add_custom_target(test-transport + COMMAND ctest --output-on-failure --tests-regex ^.+test-parameterization_.+$ +) + # 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 diff --git a/dune/dorie/transport.cc b/test/test-transport.cc similarity index 97% rename from dune/dorie/transport.cc rename to test/test-transport.cc index e0b966fc..45f2f085 100644 --- a/dune/dorie/transport.cc +++ b/test/test-transport.cc @@ -9,9 +9,9 @@ #include #include -#include "interface/coupled_simulation.hh" -#include "interface/coupled_simulation.cc" // FIXME -#include "solver/util_grid_creator.hh" +#include +#include // FIXME +#include template using Sim = Dune::Dorie::CoupledSimulation; diff --git a/test/test-transport.mini.in b/test/test-transport.mini.in new file mode 100644 index 00000000..e69de29b -- GitLab