Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux
Commits
dca79385
Commit
dca79385
authored
Oct 18, 2019
by
Timo Koch
Browse files
[cmake] Use dumux_add_test instead of dune_add_test for backwards compatibility with Dune 2.6.0
parent
0623d170
Changes
113
Hide whitespace changes
Inline
Side-by-side
test/common/CMakeLists.txt
View file @
dca79385
...
...
@@ -7,4 +7,4 @@ add_subdirectory(spline)
add_subdirectory
(
timeloop
)
add_subdirectory
(
typetraits
)
du
ne
_add_test
(
SOURCES test_partial.cc
)
du
mux
_add_test
(
SOURCES test_partial.cc
)
test/common/boundingboxtree/CMakeLists.txt
View file @
dca79385
# build the tests for the bounding box tree
du
ne
_add_test
(
NAME test_bboxtree_dim1
du
mux
_add_test
(
NAME test_bboxtree_dim1
SOURCES test_bboxtree.cc
COMPILE_DEFINITIONS WORLD_DIMENSION=1
LABELS unit
)
du
ne
_add_test
(
NAME test_bboxtree_dim2
du
mux
_add_test
(
NAME test_bboxtree_dim2
SOURCES test_bboxtree.cc
COMPILE_DEFINITIONS WORLD_DIMENSION=2
LABELS unit
)
du
ne
_add_test
(
NAME test_bboxtree_dim3
du
mux
_add_test
(
NAME test_bboxtree_dim3
SOURCES test_bboxtree.cc
COMPILE_DEFINITIONS WORLD_DIMENSION=3
LABELS unit
)
du
ne
_add_test
(
NAME test_geometry_fracture
du
mux
_add_test
(
NAME test_geometry_fracture
SOURCES test_geometry_fracture.cc
CMAKE_GUARD dune-foamgrid_FOUND
LABELS unit
)
...
...
test/common/geometry/CMakeLists.txt
View file @
dca79385
du
ne
_add_test
(
SOURCES test_1d3d_intersection.cc LABELS unit
)
du
ne
_add_test
(
SOURCES test_2d3d_intersection.cc LABELS unit
)
du
ne
_add_test
(
SOURCES test_graham_convex_hull.cc LABELS unit
)
du
ne
_add_test
(
SOURCES test_makegeometry.cc LABELS unit
)
du
mux
_add_test
(
SOURCES test_1d3d_intersection.cc LABELS unit
)
du
mux
_add_test
(
SOURCES test_2d3d_intersection.cc LABELS unit
)
du
mux
_add_test
(
SOURCES test_graham_convex_hull.cc LABELS unit
)
du
mux
_add_test
(
SOURCES test_makegeometry.cc LABELS unit
)
test/common/math/CMakeLists.txt
View file @
dca79385
# build the test for the math header
du
ne
_add_test
(
SOURCES test_math.cc
du
mux
_add_test
(
SOURCES test_math.cc
LABELS unit
)
test/common/parameters/CMakeLists.txt
View file @
dca79385
du
ne
_add_test
(
SOURCES test_loggingparametertree.cc
du
mux
_add_test
(
SOURCES test_loggingparametertree.cc
LABELS unit
)
dune_symlink_to_source_files
(
FILES
"params.input"
)
test/common/propertysystem/CMakeLists.txt
View file @
dca79385
# build the test for the property system
du
ne
_add_test
(
SOURCES test_propertysystem.cc
du
mux
_add_test
(
SOURCES test_propertysystem.cc
LABELS unit
)
# build the test for the property system using the old macros (deprecated)
du
ne
_add_test
(
SOURCES test_propertysystem_macros.cc
du
mux
_add_test
(
SOURCES test_propertysystem_macros.cc
LABELS unit
)
test/common/spline/CMakeLists.txt
View file @
dca79385
du
ne
_add_test
(
SOURCES test_spline.cc
du
mux
_add_test
(
SOURCES test_spline.cc
LABELS unit
)
test/common/timeloop/CMakeLists.txt
View file @
dca79385
du
ne
_add_test
(
SOURCES test_timeloop.cc
du
mux
_add_test
(
SOURCES test_timeloop.cc
LABELS unit
)
test/common/typetraits/CMakeLists.txt
View file @
dca79385
du
ne
_add_test
(
SOURCES test_isvalid.cc
du
mux
_add_test
(
SOURCES test_isvalid.cc
LABELS unit
)
test/discretization/box/CMakeLists.txt
View file @
dca79385
du
ne
_add_test
(
NAME test_boxfvgeometry
du
mux
_add_test
(
NAME test_boxfvgeometry
SOURCES test_boxfvgeometry.cc
COMPILE_DEFINITIONS ENABLE_CACHING=false
LABELS unit discretization
)
du
ne
_add_test
(
NAME test_boxfvgeometry_caching
du
mux
_add_test
(
NAME test_boxfvgeometry_caching
SOURCES test_boxfvgeometry.cc
COMPILE_DEFINITIONS ENABLE_CACHING=true
LABELS unit discretization
)
test/discretization/cellcentered/tpfa/CMakeLists.txt
View file @
dca79385
du
ne
_add_test
(
NAME test_tpfafvgeometry
du
mux
_add_test
(
NAME test_tpfafvgeometry
SOURCES test_tpfafvgeometry.cc
COMPILE_DEFINITIONS ENABLE_CACHING=false
LABELS unit discretization
)
du
ne
_add_test
(
NAME test_tpfafvgeometry_caching
du
mux
_add_test
(
NAME test_tpfafvgeometry_caching
SOURCES test_tpfafvgeometry.cc
COMPILE_DEFINITIONS ENABLE_CACHING=true
LABELS unit discretization
)
du
ne
_add_test
(
NAME test_tpfafvgeometry_nonconforming
du
mux
_add_test
(
NAME test_tpfafvgeometry_nonconforming
SOURCES test_tpfafvgeometry_nonconforming.cc
COMPILE_DEFINITIONS ENABLE_CACHING=false
CMAKE_GUARD dune-alugrid_FOUND
LABELS unit discretization
)
du
ne
_add_test
(
NAME test_cachedtpfafvgeometry_nonconforming
du
mux
_add_test
(
NAME test_cachedtpfafvgeometry_nonconforming
SOURCES test_tpfafvgeometry_nonconforming.cc
COMPILE_DEFINITIONS ENABLE_CACHING=true
CMAKE_GUARD dune-alugrid_FOUND
...
...
test/discretization/staggered/CMakeLists.txt
View file @
dca79385
du
ne
_add_test
(
NAME test_staggeredfvgeometry
du
mux
_add_test
(
NAME test_staggeredfvgeometry
SOURCES test_staggeredfvgeometry.cc
LABELS unit discretization
)
du
ne
_add_test
(
NAME test_staggered_free_flow_geometry
du
mux
_add_test
(
NAME test_staggered_free_flow_geometry
SOURCES test_staggered_free_flow_geometry.cc
LABELS unit discretization
)
test/freeflow/navierstokes/angeli/CMakeLists.txt
View file @
dca79385
du
ne
_add_test
(
NAME test_ff_navierstokes_angeli
du
mux
_add_test
(
NAME test_ff_navierstokes_angeli
SOURCES main.cc
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
...
...
test/freeflow/navierstokes/channel/1d/CMakeLists.txt
View file @
dca79385
du
ne
_add_test
(
NAME test_ff_navierstokes_1d
du
mux
_add_test
(
NAME test_ff_navierstokes_1d
SOURCES main.cc
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
...
...
test/freeflow/navierstokes/channel/2d/CMakeLists.txt
View file @
dca79385
...
...
@@ -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
)
du
ne
_add_test
(
NAME test_ff_stokes_channel
du
mux
_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"
)
du
ne
_add_test
(
NAME test_ff_navierstokes_channel
du
mux
_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"
)
du
ne
_add_test
(
NAME test_ff_stokesni_channel_convection
du
mux
_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"
)
du
ne
_add_test
(
NAME test_ff_stokesni_channel_conduction
du
mux
_add_test
(
NAME test_ff_stokesni_channel_conduction
TARGET test_ff_stokesni_channel
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
...
...
test/freeflow/navierstokes/channel/3d/CMakeLists.txt
View file @
dca79385
du
ne
_add_test
(
NAME test_ff_stokes_channel_3d
du
mux
_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}
)
du
ne
_add_test
(
NAME test_ff_stokes_channel_pseudo3d
du
mux
_add_test
(
NAME test_ff_stokes_channel_pseudo3d
SOURCES main.cc
LABELS freeflow
COMPILE_DEFINITIONS DIM_3D=0
...
...
test/freeflow/navierstokes/closedsystem/CMakeLists.txt
View file @
dca79385
add_executable
(
test_ff_navierstokes_closedsystem EXCLUDE_FROM_ALL main.cc
)
du
ne
_add_test
(
NAME test_ff_navierstokes_closedsystem_ldc_re1
du
mux
_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"
)
du
ne
_add_test
(
NAME test_ff_navierstokes_closedsystem_ldc_re1000
du
mux
_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"
)
du
ne
_add_test
(
NAME test_ff_navierstokes_closedsystem_hydrostaticpressure
du
mux
_add_test
(
NAME test_ff_navierstokes_closedsystem_hydrostaticpressure
TARGET test_ff_navierstokes_closedsystem
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
...
...
test/freeflow/navierstokes/donea/CMakeLists.txt
View file @
dca79385
du
ne
_add_test
(
NAME test_ff_stokes_donea_nocaching
du
mux
_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"
)
du
ne
_add_test
(
NAME test_ff_stokes_donea
du
mux
_add_test
(
NAME test_ff_stokes_donea
SOURCES main.cc
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
...
...
test/freeflow/navierstokes/kovasznay/CMakeLists.txt
View file @
dca79385
du
ne
_add_test
(
NAME test_ff_navierstokes_kovasznay
du
mux
_add_test
(
NAME test_ff_navierstokes_kovasznay
SOURCES main.cc
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
...
...
test/freeflow/navierstokesnc/channel/CMakeLists.txt
View file @
dca79385
...
...
@@ -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"
)
du
ne
_add_test
(
NAME test_ff_stokes2c_diffusion_mass
du
mux
_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
)
du
ne
_add_test
(
NAME test_ff_stokes2c_diffusion_mole
du
mux
_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}
)
du
ne
_add_test
(
NAME test_ff_stokes2c_advection
du
mux
_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"
)
du
ne
_add_test
(
NAME test_ff_stokes2c_advection_nocaching
du
mux
_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"
)
du
ne
_add_test
(
NAME test_ff_stokes2cni_advection
du
mux
_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"
)
du
ne
_add_test
(
NAME test_ff_stokes2cni_diffusion
du
mux
_add_test
(
NAME test_ff_stokes2cni_diffusion
TARGET test_ff_stokes2cni
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
...
...
Prev
1
2
3
4
5
6
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment