Commit dca79385 authored by Timo Koch's avatar Timo Koch
Browse files

[cmake] Use dumux_add_test instead of dune_add_test for backwards compatibility with Dune 2.6.0

parent 0623d170
......@@ -7,4 +7,4 @@ add_subdirectory(spline)
add_subdirectory(timeloop)
add_subdirectory(typetraits)
dune_add_test(SOURCES test_partial.cc)
dumux_add_test(SOURCES test_partial.cc)
# build the tests for the bounding box tree
dune_add_test(NAME test_bboxtree_dim1
dumux_add_test(NAME test_bboxtree_dim1
SOURCES test_bboxtree.cc
COMPILE_DEFINITIONS WORLD_DIMENSION=1
LABELS unit)
dune_add_test(NAME test_bboxtree_dim2
dumux_add_test(NAME test_bboxtree_dim2
SOURCES test_bboxtree.cc
COMPILE_DEFINITIONS WORLD_DIMENSION=2
LABELS unit)
dune_add_test(NAME test_bboxtree_dim3
dumux_add_test(NAME test_bboxtree_dim3
SOURCES test_bboxtree.cc
COMPILE_DEFINITIONS WORLD_DIMENSION=3
LABELS unit)
dune_add_test(NAME test_geometry_fracture
dumux_add_test(NAME test_geometry_fracture
SOURCES test_geometry_fracture.cc
CMAKE_GUARD dune-foamgrid_FOUND
LABELS unit)
......
dune_add_test(SOURCES test_1d3d_intersection.cc LABELS unit)
dune_add_test(SOURCES test_2d3d_intersection.cc LABELS unit)
dune_add_test(SOURCES test_graham_convex_hull.cc LABELS unit)
dune_add_test(SOURCES test_makegeometry.cc LABELS unit)
dumux_add_test(SOURCES test_1d3d_intersection.cc LABELS unit)
dumux_add_test(SOURCES test_2d3d_intersection.cc LABELS unit)
dumux_add_test(SOURCES test_graham_convex_hull.cc LABELS unit)
dumux_add_test(SOURCES test_makegeometry.cc LABELS unit)
# build the test for the math header
dune_add_test(SOURCES test_math.cc
dumux_add_test(SOURCES test_math.cc
LABELS unit)
dune_add_test(SOURCES test_loggingparametertree.cc
dumux_add_test(SOURCES test_loggingparametertree.cc
LABELS unit)
dune_symlink_to_source_files(FILES "params.input")
# build the test for the property system
dune_add_test(SOURCES test_propertysystem.cc
dumux_add_test(SOURCES test_propertysystem.cc
LABELS unit)
# build the test for the property system using the old macros (deprecated)
dune_add_test(SOURCES test_propertysystem_macros.cc
dumux_add_test(SOURCES test_propertysystem_macros.cc
LABELS unit)
dune_add_test(SOURCES test_spline.cc
dumux_add_test(SOURCES test_spline.cc
LABELS unit)
dune_add_test(SOURCES test_timeloop.cc
dumux_add_test(SOURCES test_timeloop.cc
LABELS unit)
dune_add_test(SOURCES test_isvalid.cc
dumux_add_test(SOURCES test_isvalid.cc
LABELS unit)
dune_add_test(NAME test_boxfvgeometry
dumux_add_test(NAME test_boxfvgeometry
SOURCES test_boxfvgeometry.cc
COMPILE_DEFINITIONS ENABLE_CACHING=false
LABELS unit discretization)
dune_add_test(NAME test_boxfvgeometry_caching
dumux_add_test(NAME test_boxfvgeometry_caching
SOURCES test_boxfvgeometry.cc
COMPILE_DEFINITIONS ENABLE_CACHING=true
LABELS unit discretization)
dune_add_test(NAME test_tpfafvgeometry
dumux_add_test(NAME test_tpfafvgeometry
SOURCES test_tpfafvgeometry.cc
COMPILE_DEFINITIONS ENABLE_CACHING=false
LABELS unit discretization)
dune_add_test(NAME test_tpfafvgeometry_caching
dumux_add_test(NAME test_tpfafvgeometry_caching
SOURCES test_tpfafvgeometry.cc
COMPILE_DEFINITIONS ENABLE_CACHING=true
LABELS unit discretization)
dune_add_test(NAME test_tpfafvgeometry_nonconforming
dumux_add_test(NAME test_tpfafvgeometry_nonconforming
SOURCES test_tpfafvgeometry_nonconforming.cc
COMPILE_DEFINITIONS ENABLE_CACHING=false
CMAKE_GUARD dune-alugrid_FOUND
LABELS unit discretization)
dune_add_test(NAME test_cachedtpfafvgeometry_nonconforming
dumux_add_test(NAME test_cachedtpfafvgeometry_nonconforming
SOURCES test_tpfafvgeometry_nonconforming.cc
COMPILE_DEFINITIONS ENABLE_CACHING=true
CMAKE_GUARD dune-alugrid_FOUND
......
dune_add_test(NAME test_staggeredfvgeometry
dumux_add_test(NAME test_staggeredfvgeometry
SOURCES test_staggeredfvgeometry.cc
LABELS unit discretization)
dune_add_test(NAME test_staggered_free_flow_geometry
dumux_add_test(NAME test_staggered_free_flow_geometry
SOURCES test_staggered_free_flow_geometry.cc
LABELS unit discretization)
dune_add_test(NAME test_ff_navierstokes_angeli
dumux_add_test(NAME test_ff_navierstokes_angeli
SOURCES main.cc
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......
dune_add_test(NAME test_ff_navierstokes_1d
dumux_add_test(NAME test_ff_navierstokes_1d
SOURCES main.cc
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......
......@@ -2,7 +2,7 @@ dune_symlink_to_source_files(FILES "params.input" "params_navierstokes.input" "p
add_executable(test_ff_channel EXCLUDE_FROM_ALL main.cc)
dune_add_test(NAME test_ff_stokes_channel
dumux_add_test(NAME test_ff_stokes_channel
TARGET test_ff_channel
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......@@ -13,7 +13,7 @@ dune_add_test(NAME test_ff_stokes_channel
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_channel params.input
-Problem.Name test_ff_stokes_channel")
dune_add_test(NAME test_ff_navierstokes_channel
dumux_add_test(NAME test_ff_navierstokes_channel
TARGET test_ff_channel
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......@@ -28,7 +28,7 @@ dune_add_test(NAME test_ff_navierstokes_channel
add_executable(test_ff_stokesni_channel EXCLUDE_FROM_ALL main.cc)
target_compile_definitions(test_ff_stokesni_channel PUBLIC "NONISOTHERMAL=1")
dune_add_test(NAME test_ff_stokesni_channel_convection
dumux_add_test(NAME test_ff_stokesni_channel_convection
TARGET test_ff_stokesni_channel
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......@@ -39,7 +39,7 @@ dune_add_test(NAME test_ff_stokesni_channel_convection
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokesni_channel params_convection.input
-Problem.Name test_ff_stokesni_channel_convection")
dune_add_test(NAME test_ff_stokesni_channel_conduction
dumux_add_test(NAME test_ff_stokesni_channel_conduction
TARGET test_ff_stokesni_channel
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......
dune_add_test(NAME test_ff_stokes_channel_3d
dumux_add_test(NAME test_ff_stokes_channel_3d
SOURCES main.cc
LABELS freeflow
COMPILE_DEFINITIONS DIM_3D=1
......@@ -11,7 +11,7 @@ dune_add_test(NAME test_ff_stokes_channel_3d
-Problem.Name test_ff_stokes_channel_3d"
--zeroThreshold {"velocity_liq \(m/s\)":1e-12})
dune_add_test(NAME test_ff_stokes_channel_pseudo3d
dumux_add_test(NAME test_ff_stokes_channel_pseudo3d
SOURCES main.cc
LABELS freeflow
COMPILE_DEFINITIONS DIM_3D=0
......
add_executable(test_ff_navierstokes_closedsystem EXCLUDE_FROM_ALL main.cc)
dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1
dumux_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1
TARGET test_ff_navierstokes_closedsystem
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......@@ -11,7 +11,7 @@ dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_closedsystem params_re1.input
-Problem.Name test_ff_navierstokes_closedsystem_ldc_re1")
dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1000
dumux_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1000
TARGET test_ff_navierstokes_closedsystem
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......@@ -22,7 +22,7 @@ dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1000
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_closedsystem params_re1000.input
-Problem.Name test_ff_navierstokes_closedsystem_ldc_re1000")
dune_add_test(NAME test_ff_navierstokes_closedsystem_hydrostaticpressure
dumux_add_test(NAME test_ff_navierstokes_closedsystem_hydrostaticpressure
TARGET test_ff_navierstokes_closedsystem
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......
dune_add_test(NAME test_ff_stokes_donea_nocaching
dumux_add_test(NAME test_ff_stokes_donea_nocaching
SOURCES main.cc
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......@@ -10,7 +10,7 @@ dune_add_test(NAME test_ff_stokes_donea_nocaching
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes_donea_nocaching params.input
-Problem.Name test_ff_stokes_donea_nocaching")
dune_add_test(NAME test_ff_stokes_donea
dumux_add_test(NAME test_ff_stokes_donea
SOURCES main.cc
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......
dune_add_test(NAME test_ff_navierstokes_kovasznay
dumux_add_test(NAME test_ff_navierstokes_kovasznay
SOURCES main.cc
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......
......@@ -3,7 +3,7 @@ dune_symlink_to_source_files(FILES "params_advection.input" "params_diffusion.in
add_executable(test_ff_stokes2c_mass EXCLUDE_FROM_ALL main.cc)
target_compile_definitions(test_ff_stokes2c_mass PUBLIC "USE_MASS=1")
dune_add_test(NAME test_ff_stokes2c_diffusion_mass
dumux_add_test(NAME test_ff_stokes2c_diffusion_mass
TARGET test_ff_stokes2c_mass
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......@@ -17,7 +17,7 @@ dune_add_test(NAME test_ff_stokes2c_diffusion_mass
add_executable(test_ff_stokes2c EXCLUDE_FROM_ALL main.cc)
dune_add_test(NAME test_ff_stokes2c_diffusion_mole
dumux_add_test(NAME test_ff_stokes2c_diffusion_mole
TARGET test_ff_stokes2c
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......@@ -29,7 +29,7 @@ dune_add_test(NAME test_ff_stokes2c_diffusion_mole
-Problem.Name test_ff_stokes2c_diffusion_mole"
--zeroThreshold {"velocity_liq \(m/s\)":1e-22})
dune_add_test(NAME test_ff_stokes2c_advection
dumux_add_test(NAME test_ff_stokes2c_advection
TARGET test_ff_stokes2c
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......@@ -40,7 +40,7 @@ dune_add_test(NAME test_ff_stokes2c_advection
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2c params_advection.input
-Problem.Name test_ff_stokes2c_advection")
dune_add_test(NAME test_ff_stokes2c_advection_nocaching
dumux_add_test(NAME test_ff_stokes2c_advection_nocaching
SOURCES main.cc
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......@@ -55,7 +55,7 @@ dune_add_test(NAME test_ff_stokes2c_advection_nocaching
add_executable(test_ff_stokes2cni EXCLUDE_FROM_ALL main.cc)
target_compile_definitions(test_ff_stokes2cni PUBLIC "NONISOTHERMAL=1")
dune_add_test(NAME test_ff_stokes2cni_advection
dumux_add_test(NAME test_ff_stokes2cni_advection
TARGET test_ff_stokes2cni
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......@@ -66,7 +66,7 @@ dune_add_test(NAME test_ff_stokes2cni_advection
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_stokes2cni params_advectionni.input
-Problem.Name test_ff_stokes2cni_advection")
dune_add_test(NAME test_ff_stokes2cni_diffusion
dumux_add_test(NAME test_ff_stokes2cni_diffusion
TARGET test_ff_stokes2cni
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
......
Supports Markdown
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