From 87d1789a31fa864c2628d6ebe9cc3ea6bf9ab661 Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Fri, 21 May 2021 07:46:13 +0000 Subject: [PATCH 1/2] [handbook] Use dumux_add_test --- doc/handbook/5_newfoldersetup.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/handbook/5_newfoldersetup.tex b/doc/handbook/5_newfoldersetup.tex index 5537c0925b..a8767af89b 100644 --- a/doc/handbook/5_newfoldersetup.tex +++ b/doc/handbook/5_newfoldersetup.tex @@ -17,7 +17,7 @@ the build system there is a new one. The macro can be used with a variable amount of arguments. A simple call could look like this: \begin{lstlisting}[style=DumuxCode] -dune_add_test(NAME my_test +dumux_add_test(NAME my_test SOURCES main.cc CMD_ARGS my_test params.input) \end{lstlisting} -- GitLab From 37009b3a64e9669063551a814245a911affff4dc Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Fri, 21 May 2021 07:50:06 +0000 Subject: [PATCH 2/2] [test] Use dumux_add_test dumux_add_test makes additional checks and writes important files for the CI to work --- examples/1protationsymmetry/CMakeLists.txt | 2 +- test/material/fluidmatrixinteractions/2p/CMakeLists.txt | 8 ++++---- .../stokesdarcy/1p_1p/convergencetest/CMakeLists.txt | 4 ++-- test/porenetwork/1p/noncreepingflow/CMakeLists.txt | 2 +- .../1p/noncreepingflow/nonisothermal/CMakeLists.txt | 2 +- test/porousmediumflow/tracer/multiphase/CMakeLists.txt | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/1protationsymmetry/CMakeLists.txt b/examples/1protationsymmetry/CMakeLists.txt index 1baf3a3c21..03acc84bdb 100644 --- a/examples/1protationsymmetry/CMakeLists.txt +++ b/examples/1protationsymmetry/CMakeLists.txt @@ -1,6 +1,6 @@ dune_symlink_to_source_files(FILES "params.input") -dune_add_test(NAME example_1p_rotationsymmetry +dumux_add_test(NAME example_1p_rotationsymmetry LABELS porousmediumflow 1p example SOURCES main.cc COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/material/fluidmatrixinteractions/2p/CMakeLists.txt b/test/material/fluidmatrixinteractions/2p/CMakeLists.txt index 4b9a096a99..caf4808431 100644 --- a/test/material/fluidmatrixinteractions/2p/CMakeLists.txt +++ b/test/material/fluidmatrixinteractions/2p/CMakeLists.txt @@ -25,10 +25,10 @@ dumux_add_test(SOURCES test_material_2p_brookscorey.cc --command "${CMAKE_CURRENT_BINARY_DIR}/test_material_2p_brookscorey") -dune_add_test(SOURCES test_material_2p_spline.cc - LABELS unit material) +dumux_add_test(SOURCES test_material_2p_spline.cc + LABELS unit material) -dune_add_test(SOURCES test_material_2p_dataspline.cc - LABELS unit material) +dumux_add_test(SOURCES test_material_2p_dataspline.cc + LABELS unit material) dune_symlink_to_source_files(FILES test_material_2p_spline.input test_material_2p_dataspline.input) diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/CMakeLists.txt index cace090696..998112d9a3 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/CMakeLists.txt +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/CMakeLists.txt @@ -3,7 +3,7 @@ dune_symlink_to_source_files(FILES "convergencetest.py") add_executable(test_md_boundary_darcy1p_freeflow1p_convtest EXCLUDE_FROM_ALL main.cc) -dune_add_test(NAME test_md_boundary_darcy1p_stokes1p_convtest +dumux_add_test(NAME test_md_boundary_darcy1p_stokes1p_convtest TARGET test_md_boundary_darcy1p_freeflow1p_convtest LABELS multidomain multidomain_boundary stokesdarcy TIMEOUT 1000 @@ -13,7 +13,7 @@ dune_add_test(NAME test_md_boundary_darcy1p_stokes1p_convtest -Problem.TestCase ShiueExampleTwo -Darcy.SpatialParams.Permeability 1.0) -dune_add_test(NAME test_md_boundary_darcy1p_navierstokes1p_convtest +dumux_add_test(NAME test_md_boundary_darcy1p_navierstokes1p_convtest TARGET test_md_boundary_darcy1p_freeflow1p_convtest LABELS multidomain multidomain_boundary stokesdarcy TIMEOUT 1000 diff --git a/test/porenetwork/1p/noncreepingflow/CMakeLists.txt b/test/porenetwork/1p/noncreepingflow/CMakeLists.txt index 68122a5f57..fb448042ba 100644 --- a/test/porenetwork/1p/noncreepingflow/CMakeLists.txt +++ b/test/porenetwork/1p/noncreepingflow/CMakeLists.txt @@ -2,7 +2,7 @@ add_subdirectory(nonisothermal) add_input_file_links() -dune_add_test(NAME test_pnm_1p_noncreeping_flow +dumux_add_test(NAME test_pnm_1p_noncreeping_flow SOURCES main.cc LABELS porenetworkflow COMPILE_DEFINITIONS ISOTHERMAL=1 diff --git a/test/porenetwork/1p/noncreepingflow/nonisothermal/CMakeLists.txt b/test/porenetwork/1p/noncreepingflow/nonisothermal/CMakeLists.txt index bbc8b16578..8059dd66c2 100644 --- a/test/porenetwork/1p/noncreepingflow/nonisothermal/CMakeLists.txt +++ b/test/porenetwork/1p/noncreepingflow/nonisothermal/CMakeLists.txt @@ -1,6 +1,6 @@ add_input_file_links() -dune_add_test(NAME test_pnm_1pni_noncreeping_flow +dumux_add_test(NAME test_pnm_1pni_noncreeping_flow SOURCES main.cc LABELS porenetworkflow COMPILE_DEFINITIONS ISOTHERMAL=0 diff --git a/test/porousmediumflow/tracer/multiphase/CMakeLists.txt b/test/porousmediumflow/tracer/multiphase/CMakeLists.txt index 3f6ec40e2e..f66ec84220 100644 --- a/test/porousmediumflow/tracer/multiphase/CMakeLists.txt +++ b/test/porousmediumflow/tracer/multiphase/CMakeLists.txt @@ -1,6 +1,6 @@ dune_symlink_to_source_files(FILES "params.input") -dune_add_test(NAME test_tracer_multiphase_tpfa +dumux_add_test(NAME test_tracer_multiphase_tpfa LABELS porousmediumflow tracer SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa @@ -10,7 +10,7 @@ dune_add_test(NAME test_tracer_multiphase_tpfa ${CMAKE_CURRENT_BINARY_DIR}/test_tracer_multiphase_tpfa-00010.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_multiphase_tpfa params.input -Problem.Name test_tracer_multiphase_tpfa") -dune_add_test(NAME test_tracer_multiphase_mpfa +dumux_add_test(NAME test_tracer_multiphase_mpfa LABELS porousmediumflow tracer SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=TracerTestMpfa -- GitLab