Skip to content
Snippets Groups Projects
Commit 9779114b authored by Dennis Gläser's avatar Dennis Gläser
Browse files

Merge branch 'fix/use-dumux-add-test' into 'master'

Use dumux_add_test

See merge request !2633
parents 9b0db493 37009b3a
No related branches found
No related tags found
1 merge request!2633Use dumux_add_test instead of dune_add_test
...@@ -17,7 +17,7 @@ the build system there is a new one. ...@@ -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: The macro can be used with a variable amount of arguments. A simple call could look like this:
\begin{lstlisting}[style=DumuxCode] \begin{lstlisting}[style=DumuxCode]
dune_add_test(NAME my_test dumux_add_test(NAME my_test
SOURCES main.cc SOURCES main.cc
CMD_ARGS my_test params.input) CMD_ARGS my_test params.input)
\end{lstlisting} \end{lstlisting}
......
dune_symlink_to_source_files(FILES "params.input") 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 LABELS porousmediumflow 1p example
SOURCES main.cc SOURCES main.cc
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
......
...@@ -25,10 +25,10 @@ dumux_add_test(SOURCES test_material_2p_brookscorey.cc ...@@ -25,10 +25,10 @@ dumux_add_test(SOURCES test_material_2p_brookscorey.cc
--command "${CMAKE_CURRENT_BINARY_DIR}/test_material_2p_brookscorey") --command "${CMAKE_CURRENT_BINARY_DIR}/test_material_2p_brookscorey")
dune_add_test(SOURCES test_material_2p_spline.cc dumux_add_test(SOURCES test_material_2p_spline.cc
LABELS unit material) LABELS unit material)
dune_add_test(SOURCES test_material_2p_dataspline.cc dumux_add_test(SOURCES test_material_2p_dataspline.cc
LABELS unit material) LABELS unit material)
dune_symlink_to_source_files(FILES test_material_2p_spline.input test_material_2p_dataspline.input) dune_symlink_to_source_files(FILES test_material_2p_spline.input test_material_2p_dataspline.input)
...@@ -3,7 +3,7 @@ dune_symlink_to_source_files(FILES "convergencetest.py") ...@@ -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) 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 TARGET test_md_boundary_darcy1p_freeflow1p_convtest
LABELS multidomain multidomain_boundary stokesdarcy LABELS multidomain multidomain_boundary stokesdarcy
TIMEOUT 1000 TIMEOUT 1000
...@@ -13,7 +13,7 @@ dune_add_test(NAME test_md_boundary_darcy1p_stokes1p_convtest ...@@ -13,7 +13,7 @@ dune_add_test(NAME test_md_boundary_darcy1p_stokes1p_convtest
-Problem.TestCase ShiueExampleTwo -Problem.TestCase ShiueExampleTwo
-Darcy.SpatialParams.Permeability 1.0) -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 TARGET test_md_boundary_darcy1p_freeflow1p_convtest
LABELS multidomain multidomain_boundary stokesdarcy LABELS multidomain multidomain_boundary stokesdarcy
TIMEOUT 1000 TIMEOUT 1000
......
...@@ -2,7 +2,7 @@ add_subdirectory(nonisothermal) ...@@ -2,7 +2,7 @@ add_subdirectory(nonisothermal)
add_input_file_links() 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 SOURCES main.cc
LABELS porenetworkflow LABELS porenetworkflow
COMPILE_DEFINITIONS ISOTHERMAL=1 COMPILE_DEFINITIONS ISOTHERMAL=1
......
add_input_file_links() 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 SOURCES main.cc
LABELS porenetworkflow LABELS porenetworkflow
COMPILE_DEFINITIONS ISOTHERMAL=0 COMPILE_DEFINITIONS ISOTHERMAL=0
......
dune_symlink_to_source_files(FILES "params.input") 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 LABELS porousmediumflow tracer
SOURCES main.cc SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa
...@@ -10,7 +10,7 @@ dune_add_test(NAME test_tracer_multiphase_tpfa ...@@ -10,7 +10,7 @@ dune_add_test(NAME test_tracer_multiphase_tpfa
${CMAKE_CURRENT_BINARY_DIR}/test_tracer_multiphase_tpfa-00010.vtu ${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") --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 LABELS porousmediumflow tracer
SOURCES main.cc SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestMpfa COMPILE_DEFINITIONS TYPETAG=TracerTestMpfa
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment