diff --git a/test/io/container/CMakeLists.txt b/test/io/container/CMakeLists.txt
index 2ce265eedcc138f979bfaf6abcd0ab9b6aad988d..24b77145920a4aa2fd077decb6cc1dd0b51e2b14 100644
--- a/test/io/container/CMakeLists.txt
+++ b/test/io/container/CMakeLists.txt
@@ -1,2 +1,2 @@
dune_add_test(SOURCES test_container_io.cc
- LABELS unit)
+ LABELS unit io)
diff --git a/test/io/gnuplotinterface/CMakeLists.txt b/test/io/gnuplotinterface/CMakeLists.txt
index 4339856ebe8f525be646625f5604be4bc212fd39..0d209d496edeae3b3b87cb940d33cde69d3c5c60 100644
--- a/test/io/gnuplotinterface/CMakeLists.txt
+++ b/test/io/gnuplotinterface/CMakeLists.txt
@@ -1,3 +1,3 @@
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output")
dune_add_test(SOURCES test_gnuplotinterface.cc
- LABELS unit)
+ LABELS unit io)
diff --git a/test/io/gridmanager/CMakeLists.txt b/test/io/gridmanager/CMakeLists.txt
index d89013d04b379f014aa8e8d0ce66638c87583fb7..77a99ba9a647807c798d79c790de74ebbf41d4e2 100644
--- a/test/io/gridmanager/CMakeLists.txt
+++ b/test/io/gridmanager/CMakeLists.txt
@@ -5,7 +5,7 @@ add_executable(test_gridmanager_cake EXCLUDE_FROM_ALL test_gridmanager_cake.cc)
dune_add_test(NAME test_gridmanager_cake_360
TARGET test_gridmanager_cake
- LABELS unit
+ LABELS unit io
CMAKE_GUARD "( dune-uggrid_FOUND OR dune-alugrid_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
@@ -17,7 +17,7 @@ dune_add_test(NAME test_gridmanager_cake_360
dune_add_test(NAME test_gridmanager_cake_210
TARGET test_gridmanager_cake
- LABELS unit
+ LABELS unit io
CMAKE_GUARD "( dune-uggrid_FOUND OR dune-alugrid_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
@@ -29,7 +29,7 @@ dune_add_test(NAME test_gridmanager_cake_210
dune_add_test(NAME test_gridmanager_subgrid
SOURCES test_gridmanager_subgrid.cc
- LABELS unit
+ LABELS unit io
CMAKE_GUARD dune-subgrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
@@ -46,7 +46,7 @@ target_compile_definitions(test_gridmanager_gmsh_3d_alu PUBLIC GRIDTYPE=Dune::AL
dune_add_test(NAME test_gridmanager_gmsh_3d_alu_sequential
TARGET test_gridmanager_gmsh_3d_alu
- LABELS unit
+ LABELS unit io
CMAKE_GUARD dune-alugrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
@@ -56,7 +56,7 @@ dune_add_test(NAME test_gridmanager_gmsh_3d_alu_sequential
dune_add_test(NAME test_gridmanager_gmsh_3d_alu_parallel
TARGET test_gridmanager_gmsh_3d_alu
- LABELS unit
+ LABELS unit io
CMAKE_GUARD dune-alugrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -69,7 +69,7 @@ target_compile_definitions(test_gridmanager_gmsh_3d_ug PUBLIC GRIDTYPE=Dune::UGG
dune_add_test(NAME test_gridmanager_gmsh_3d_ug_sequential
TARGET test_gridmanager_gmsh_3d_ug
- LABELS unit
+ LABELS unit io
CMAKE_GUARD dune-uggrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
@@ -81,7 +81,7 @@ dune_add_test(NAME test_gridmanager_gmsh_3d_ug_sequential
dune_add_test(NAME test_gridmanager_gmsh_3d_ug_parallel
TARGET test_gridmanager_gmsh_3d_ug
- LABELS unit
+ LABELS unit io
CMAKE_GUARD dune-uggrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -94,7 +94,7 @@ target_compile_definitions(test_gridmanager_gmsh_e_markers_alu PUBLIC GRIDTYPE=D
dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_sequential
TARGET test_gridmanager_gmsh_e_markers_alu
- LABELS unit
+ LABELS unit io
CMAKE_GUARD dune-alugrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
@@ -106,7 +106,7 @@ dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_sequential
dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_parallel
TARGET test_gridmanager_gmsh_e_markers_alu
- LABELS unit
+ LABELS unit io
CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -121,7 +121,7 @@ target_compile_definitions(test_gridmanager_gmsh_e_markers_ug PUBLIC GRIDTYPE=Du
dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_sequential
TARGET test_gridmanager_gmsh_e_markers_ug
- LABELS unit
+ LABELS unit io
CMAKE_GUARD dune-uggrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
@@ -133,7 +133,7 @@ dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_sequential
dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_parallel
TARGET test_gridmanager_gmsh_e_markers_ug
- LABELS unit
+ LABELS unit io
CMAKE_GUARD "( dune-uggrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -148,7 +148,7 @@ target_compile_definitions(test_gridmanager_dgf_alu PUBLIC GRIDTYPE=Dune::ALUGri
dune_add_test(NAME test_gridmanager_dgf_alu_sequential
TARGET test_gridmanager_dgf_alu
- LABELS unit
+ LABELS unit io
CMAKE_GUARD dune-alugrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
@@ -162,7 +162,7 @@ dune_add_test(NAME test_gridmanager_dgf_alu_sequential
dune_add_test(NAME test_gridmanager_dgf_alu_parallel
TARGET test_gridmanager_dgf_alu
- LABELS unit
+ LABELS unit io
CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -179,7 +179,7 @@ target_compile_definitions(test_gridmanager_dgf_ug PUBLIC GRIDTYPE=Dune::UGGrid<
dune_add_test(NAME test_gridmanager_dgf_ug_sequential
TARGET test_gridmanager_dgf_ug
- LABELS unit
+ LABELS unit io
CMAKE_GUARD dune-uggrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
@@ -193,7 +193,7 @@ dune_add_test(NAME test_gridmanager_dgf_ug_sequential
dune_add_test(NAME test_gridmanager_dgf_ug_parallel
TARGET test_gridmanager_dgf_ug
- LABELS unit
+ LABELS unit io
CMAKE_GUARD "( dune-uggrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
diff --git a/test/io/vtk/CMakeLists.txt b/test/io/vtk/CMakeLists.txt
index b4344da7edcff23aff566e46b7fe9262684d1914..451a04ded382b52afb4d2e5c28d166b8ae780b24 100644
--- a/test/io/vtk/CMakeLists.txt
+++ b/test/io/vtk/CMakeLists.txt
@@ -2,7 +2,7 @@ add_input_file_links()
dune_add_test(NAME test_vtkreader_3d
SOURCES test_vtkreader.cc
- LABELS unit
+ LABELS unit io
CMAKE_GUARD dune-alugrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<3,3,Dune::cube,Dune::nonconforming>
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -19,7 +19,7 @@ dune_add_test(NAME test_vtkreader_3d
dune_add_test(NAME test_vtkreader_2d
SOURCES test_vtkreader.cc
- LABELS unit
+ LABELS unit io
CMAKE_GUARD dune-alugrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -31,7 +31,7 @@ dune_add_test(NAME test_vtkreader_2d
dune_add_test(NAME test_vtkreader_2d3d
SOURCES test_vtkreader.cc
- LABELS unit
+ LABELS unit io
CMAKE_GUARD dune-foamgrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::FoamGrid<2,3>
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -43,7 +43,7 @@ dune_add_test(NAME test_vtkreader_2d3d
dune_add_test(NAME test_vtkreader_1d
SOURCES test_vtkreader.cc
- LABELS unit
+ LABELS unit io
CMAKE_GUARD dune-foamgrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::FoamGrid<1,3>
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -55,4 +55,4 @@ dune_add_test(NAME test_vtkreader_1d
dune_add_test(NAME test_vtk_staggeredfreeflowpvnames
SOURCES test_vtk_staggeredfreeflowpvnames.cc
- LABELS unit)
+ LABELS unit io)
diff --git a/test/material/components/CMakeLists.txt b/test/material/components/CMakeLists.txt
index 682a95a382f880fcb8e00291e9fc90d35f850a05..46f3c0bb215c6669c77141b323d7b869086deb77 100644
--- a/test/material/components/CMakeLists.txt
+++ b/test/material/components/CMakeLists.txt
@@ -1,6 +1,6 @@
dune_add_test(SOURCES test_componenttraits.cc
COMPILE_ONLY
- LABELS unit)
+ LABELS unit material)
add_executable(plot_component plotproperties.cc)
@@ -8,118 +8,118 @@ dune_add_test(NAME plot_air
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "Air"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_benzene
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "Benzene"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_brine
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "Brine"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_calcite
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "Calcite"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_calciumion
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "CalciumIon"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_cao
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "CaO"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_cao2h2
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "CaO2H2"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_carbonateion
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "CarbonateIon"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_ch4
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "CH4"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_granite
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "Granite"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_h2
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "H2"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_h2o
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "H2O"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_heavyoil
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "HeavyOil"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_mesitylene
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "Mesitylene"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_n2
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "N2"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_nacl
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "NaCl"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_o2
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "O2"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_simpleh2o
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "SimpleH2O"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_trichloroethene
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "Trichloroethene"
- LABELS unit)
+ LABELS unit material)
dune_add_test(NAME plot_xylene
TARGET plot_component
COMMAND ./plot_component
CMD_ARGS "Xylene"
- LABELS unit)
+ LABELS unit material)
diff --git a/test/material/fluidmatrixinteractions/2p/CMakeLists.txt b/test/material/fluidmatrixinteractions/2p/CMakeLists.txt
index 0865389cb6be58c40415b0533f2106ae41658996..0c003b94181fca673f66bbf5c52311c9d9f95643 100644
--- a/test/material/fluidmatrixinteractions/2p/CMakeLists.txt
+++ b/test/material/fluidmatrixinteractions/2p/CMakeLists.txt
@@ -1,5 +1,5 @@
dune_add_test(SOURCES test_thermalconductivityjohansen.cc
- LABELS unit
+ LABELS unit material
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzyData --delimiter " "
--files ${CMAKE_SOURCE_DIR}/test/references/thermalconductivityjohansen-reference.dat
@@ -7,7 +7,7 @@ dune_add_test(SOURCES test_thermalconductivityjohansen.cc
--command "${CMAKE_CURRENT_BINARY_DIR}/test_thermalconductivityjohansen")
dune_add_test(SOURCES test_thermalconductivitysomerton.cc
- LABELS unit
+ LABELS unit material
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzyData --delimiter " "
--files ${CMAKE_SOURCE_DIR}/test/references/thermalconductivitysomerton-reference.dat
diff --git a/test/material/fluidmatrixinteractions/CMakeLists.txt b/test/material/fluidmatrixinteractions/CMakeLists.txt
index 06e695f7e5afe8ef4828aadfbc5ed39dd38d0761..9dc48993b2e76e44edfe1eed58b74c0797a0a8f9 100644
--- a/test/material/fluidmatrixinteractions/CMakeLists.txt
+++ b/test/material/fluidmatrixinteractions/CMakeLists.txt
@@ -1,7 +1,7 @@
add_subdirectory(2p)
dune_add_test(SOURCES test_effectivediffusivitymillingtonquirk.cc
- LABELS unit
+ LABELS unit material
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzyData --delimiter " "
--files ${CMAKE_SOURCE_DIR}/test/references/effectivediffusivitymillingtonquirk-reference.dat
@@ -9,7 +9,7 @@ dune_add_test(SOURCES test_effectivediffusivitymillingtonquirk.cc
--command "${CMAKE_CURRENT_BINARY_DIR}/test_effectivediffusivitymillingtonquirk")
dune_add_test(SOURCES test_effectivediffusivityconstanttortuosity.cc
- LABELS unit
+ LABELS unit material
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzyData --delimiter " "
--files ${CMAKE_SOURCE_DIR}/test/references/effectivediffusivityconstanttau-reference.dat
diff --git a/test/material/fluidsystems/CMakeLists.txt b/test/material/fluidsystems/CMakeLists.txt
index f471ca738fb9cb32a5b9d0d31651284895e021e8..659c138e7a4044336d5f464ee9258df02fa702f0 100644
--- a/test/material/fluidsystems/CMakeLists.txt
+++ b/test/material/fluidsystems/CMakeLists.txt
@@ -1,2 +1,2 @@
dune_add_test(SOURCES test_fluidsystems.cc
- LABELS unit)
+ LABELS unit material)
diff --git a/test/material/immiscibleflash/CMakeLists.txt b/test/material/immiscibleflash/CMakeLists.txt
index 4c955a241f9cde3967ac2d707903e18ae3e4dfe5..5f714d0e878209b28b093175bfd9eca7b85b494c 100644
--- a/test/material/immiscibleflash/CMakeLists.txt
+++ b/test/material/immiscibleflash/CMakeLists.txt
@@ -1,2 +1,2 @@
dune_add_test(SOURCES test_immiscibleflash.cc
- LABELS unit)
+ LABELS unit material)
diff --git a/test/material/ncpflash/CMakeLists.txt b/test/material/ncpflash/CMakeLists.txt
index eb6e36a0ed9c9667cc8df5f6904bd7191902b3f2..fccaf9b1ff689552185708ee246e65aff2746be3 100644
--- a/test/material/ncpflash/CMakeLists.txt
+++ b/test/material/ncpflash/CMakeLists.txt
@@ -1,2 +1,2 @@
dune_add_test(SOURCES test_ncpflash.cc
- LABELS unit)
+ LABELS unit material)
diff --git a/test/material/pengrobinson/CMakeLists.txt b/test/material/pengrobinson/CMakeLists.txt
index 54bfbe047b0ab1e6e60397897fce166d50a26ab7..1fb81455c590daa2af9791de96f3a5416a3c9e3b 100644
--- a/test/material/pengrobinson/CMakeLists.txt
+++ b/test/material/pengrobinson/CMakeLists.txt
@@ -1,2 +1,2 @@
dune_add_test(SOURCES test_pengrobinson.cc
- LABELS unit)
+ LABELS unit material)
diff --git a/test/material/solidsystems/CMakeLists.txt b/test/material/solidsystems/CMakeLists.txt
index 5ba057cfae1a2e6e47853ab52f7d965a731f5b53..a89f504362b3575ed54aa414c0b946323a7ad4b1 100644
--- a/test/material/solidsystems/CMakeLists.txt
+++ b/test/material/solidsystems/CMakeLists.txt
@@ -1,2 +1,2 @@
dune_add_test(SOURCES test_solidsystems.cc
- LABELS unit)
+ LABELS unit material)
diff --git a/test/material/tabulation/CMakeLists.txt b/test/material/tabulation/CMakeLists.txt
index 554102e524ccd5df5cf8a6c95883b02f2c0ebc12..2174ab13e395902a47318d9a706fa5365f2364ea 100644
--- a/test/material/tabulation/CMakeLists.txt
+++ b/test/material/tabulation/CMakeLists.txt
@@ -1,2 +1,2 @@
dune_add_test(SOURCES test_tabulation.cc
- LABELS unit)
+ LABELS unit material)