Commit 6db23ce7 authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'feature/test-timeouts' into 'master'

[test] Increase timeout of tests that take long without compiler optimisations

See merge request !2660
parents 3212ed17 2d1ed3fa
Pipeline #4801 passed with stages
in 0 seconds
...@@ -3,6 +3,7 @@ dune_symlink_to_source_files(FILES injection_checkpoints.dat injection_type.dat ...@@ -3,6 +3,7 @@ dune_symlink_to_source_files(FILES injection_checkpoints.dat injection_type.dat
# compile MICP simplified chemistry column setup # compile MICP simplified chemistry column setup
dumux_add_test(NAME example_biomineralization dumux_add_test(NAME example_biomineralization
LABELS porousmediumflow example LABELS porousmediumflow example
TIMEOUT 3600
SOURCES main.cc SOURCES main.cc
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy CMD_ARGS --script fuzzy
......
...@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "params.input") ...@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "params.input")
dumux_add_test(NAME example_shallowwaterfriction dumux_add_test(NAME example_shallowwaterfriction
LABELS shallowwater example LABELS shallowwater example
TIMEOUT 3600
SOURCES main.cc SOURCES main.cc
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy CMD_ARGS --script fuzzy
......
...@@ -16,6 +16,7 @@ target_compile_definitions(test_ff_navierstokes_kovasznay_higherorder PUBLIC "UP ...@@ -16,6 +16,7 @@ target_compile_definitions(test_ff_navierstokes_kovasznay_higherorder PUBLIC "UP
dumux_add_test(NAME test_ff_navierstokes_kovasznay_higherorder_cuboid dumux_add_test(NAME test_ff_navierstokes_kovasznay_higherorder_cuboid
TARGET test_ff_navierstokes_kovasznay_higherorder TARGET test_ff_navierstokes_kovasznay_higherorder
LABELS freeflow navierstokes LABELS freeflow navierstokes
TIMEOUT 3600
CMAKE_GUARD HAVE_UMFPACK CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy CMD_ARGS --script fuzzy
...@@ -29,6 +30,7 @@ dumux_add_test(NAME test_ff_navierstokes_kovasznay_higherorder_cuboid ...@@ -29,6 +30,7 @@ dumux_add_test(NAME test_ff_navierstokes_kovasznay_higherorder_cuboid
dumux_add_test(NAME test_ff_navierstokes_kovasznay_higherorder_staircase dumux_add_test(NAME test_ff_navierstokes_kovasznay_higherorder_staircase
TARGET test_ff_navierstokes_kovasznay_higherorder TARGET test_ff_navierstokes_kovasznay_higherorder
LABELS freeflow navierstokes LABELS freeflow navierstokes
TIMEOUT 3600
CMAKE_GUARD HAVE_UMFPACK dune-subgrid_FOUND CMAKE_GUARD HAVE_UMFPACK dune-subgrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy CMD_ARGS --script fuzzy
......
...@@ -4,7 +4,7 @@ dune_symlink_to_source_files(FILES "params.input") ...@@ -4,7 +4,7 @@ dune_symlink_to_source_files(FILES "params.input")
dumux_add_test(NAME test_ff_navierstokes_sincos dumux_add_test(NAME test_ff_navierstokes_sincos
SOURCES main.cc SOURCES main.cc
LABELS freeflow LABELS freeflow
TIMEOUT 1000 TIMEOUT 3600
CMAKE_GUARD HAVE_UMFPACK CMAKE_GUARD HAVE_UMFPACK
COMPILE_DEFINITIONS LINEARSOLVER=UMFPackBackend COMPILE_DEFINITIONS LINEARSOLVER=UMFPackBackend
COMMAND ./convergencetest.py COMMAND ./convergencetest.py
......
dumux_add_test(SOURCES test_tabulation.cc dumux_add_test(SOURCES test_tabulation.cc
LABELS unit material) TIMEOUT 3600
LABELS unit material)
...@@ -81,6 +81,7 @@ dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfatpfa_kernel ...@@ -81,6 +81,7 @@ dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfatpfa_kernel
dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfatpfa_convergence dumux_add_test(NAME test_md_embedded_1d3d_1p1p_tpfatpfa_convergence
LABELS multidomain multidomain_embedded 1p LABELS multidomain multidomain_embedded 1p
TIMEOUT 3600
TARGET test_md_embedded_1d3d_1p1p_tpfatpfa_kernel TARGET test_md_embedded_1d3d_1p1p_tpfatpfa_kernel
COMMAND ./convergence.py COMMAND ./convergence.py
CMAKE_GUARD dune-foamgrid_FOUND) CMAKE_GUARD dune-foamgrid_FOUND)
......
...@@ -85,6 +85,7 @@ dumux_add_test(NAME test_md_facet_1pncni1pncni_tpfa ...@@ -85,6 +85,7 @@ dumux_add_test(NAME test_md_facet_1pncni1pncni_tpfa
dumux_add_test(NAME test_md_facet_1pncni1pncni_mpfa dumux_add_test(NAME test_md_facet_1pncni1pncni_mpfa
SOURCES main.cc SOURCES main.cc
LABELS multidomain multidomain_facet 1pnc LABELS multidomain multidomain_facet 1pnc
TIMEOUT 3600
COMPILE_DEFINITIONS BULKTYPETAG=OnePNCNIBulkMpfa COMPILE_DEFINITIONS BULKTYPETAG=OnePNCNIBulkMpfa
COMPILE_DEFINITIONS FACETTYPETAG=OnePNCNIFacetTpfa COMPILE_DEFINITIONS FACETTYPETAG=OnePNCNIFacetTpfa
COMPILE_DEFINITIONS DIMWORLD=2 COMPILE_DEFINITIONS DIMWORLD=2
...@@ -185,6 +186,7 @@ dumux_add_test(NAME test_md_facet_1pncni1pncni_surface_tpfa ...@@ -185,6 +186,7 @@ dumux_add_test(NAME test_md_facet_1pncni1pncni_surface_tpfa
dumux_add_test(NAME test_md_facet_1pncni1pncni_surface_mpfa dumux_add_test(NAME test_md_facet_1pncni1pncni_surface_mpfa
SOURCES main.cc SOURCES main.cc
LABELS multidomain multidomain_facet 1pnc LABELS multidomain multidomain_facet 1pnc
TIMEOUT 3600
COMPILE_DEFINITIONS BULKTYPETAG=OnePNCNIBulkMpfa COMPILE_DEFINITIONS BULKTYPETAG=OnePNCNIBulkMpfa
COMPILE_DEFINITIONS FACETTYPETAG=OnePNCNIFacetTpfa COMPILE_DEFINITIONS FACETTYPETAG=OnePNCNIFacetTpfa
COMPILE_DEFINITIONS DIMWORLD=3 COMPILE_DEFINITIONS DIMWORLD=3
......
...@@ -60,6 +60,7 @@ dumux_add_test(NAME test_2p_incompressible_box_analytic ...@@ -60,6 +60,7 @@ dumux_add_test(NAME test_2p_incompressible_box_analytic
# using box with interface solver # using box with interface solver
dumux_add_test(NAME test_2p_incompressible_box_ifsolver dumux_add_test(NAME test_2p_incompressible_box_ifsolver
LABELS porousmediumflow 2p LABELS porousmediumflow 2p
TIMEOUT 3600
SOURCES main.cc SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleBox COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleBox
COMPILE_DEFINITIONS ENABLEINTERFACESOLVER=true COMPILE_DEFINITIONS ENABLEINTERFACESOLVER=true
......
...@@ -4,6 +4,7 @@ dune_symlink_to_source_files(FILES params.input) ...@@ -4,6 +4,7 @@ dune_symlink_to_source_files(FILES params.input)
dumux_add_test(NAME test_2pncmin_dissolution_box dumux_add_test(NAME test_2pncmin_dissolution_box
LABELS porousmediumflow 2pncmin LABELS porousmediumflow 2pncmin
SOURCES main.cc SOURCES main.cc
TIMEOUT 3600
COMPILE_DEFINITIONS TYPETAG=DissolutionBox COMPILE_DEFINITIONS TYPETAG=DissolutionBox
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy CMD_ARGS --script fuzzy
...@@ -14,6 +15,7 @@ dumux_add_test(NAME test_2pncmin_dissolution_box ...@@ -14,6 +15,7 @@ dumux_add_test(NAME test_2pncmin_dissolution_box
dumux_add_test(NAME test_2pncmin_dissolution_box_restart dumux_add_test(NAME test_2pncmin_dissolution_box_restart
LABELS porousmediumflow 2pncmin LABELS porousmediumflow 2pncmin
TARGET test_2pncmin_dissolution_box TARGET test_2pncmin_dissolution_box
TIMEOUT 3600
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_2pncmin_dissolution_box-reference.vtu --files ${CMAKE_SOURCE_DIR}/test/references/test_2pncmin_dissolution_box-reference.vtu
......
...@@ -10,6 +10,7 @@ dumux_add_test(NAME test_co2_box ...@@ -10,6 +10,7 @@ dumux_add_test(NAME test_co2_box
SOURCES main.cc SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=HeterogeneousBox COMPILE_DEFINITIONS TYPETAG=HeterogeneousBox
LABELS porousmediumflow co2 LABELS porousmediumflow co2
TIMEOUT 3600
CMAKE_GUARD "( dune-alugrid_FOUND )" CMAKE_GUARD "( dune-alugrid_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy CMD_ARGS --script fuzzy
...@@ -20,6 +21,7 @@ dumux_add_test(NAME test_co2_box ...@@ -20,6 +21,7 @@ dumux_add_test(NAME test_co2_box
dumux_add_test(NAME test_co2_tpfa dumux_add_test(NAME test_co2_tpfa
LABELS porousmediumflow co2 LABELS porousmediumflow co2
TIMEOUT 3600
SOURCES main.cc SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=HeterogeneousCCTpfa COMPILE_DEFINITIONS TYPETAG=HeterogeneousCCTpfa
CMAKE_GUARD "( dune-alugrid_FOUND )" CMAKE_GUARD "( dune-alugrid_FOUND )"
...@@ -32,7 +34,7 @@ dumux_add_test(NAME test_co2_tpfa ...@@ -32,7 +34,7 @@ dumux_add_test(NAME test_co2_tpfa
dumux_add_test(NAME test_co2_box_parallel dumux_add_test(NAME test_co2_box_parallel
TARGET test_co2_box TARGET test_co2_box
LABELS porousmediumflow co2 parallel LABELS porousmediumflow co2 parallel
TIMEOUT 1200 TIMEOUT 3600
CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )" CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100,"porosity":1} CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100,"porosity":1}
...@@ -43,7 +45,7 @@ dumux_add_test(NAME test_co2_box_parallel ...@@ -43,7 +45,7 @@ dumux_add_test(NAME test_co2_box_parallel
dumux_add_test(NAME test_co2_tpfa_parallel dumux_add_test(NAME test_co2_tpfa_parallel
TARGET test_co2_tpfa TARGET test_co2_tpfa
LABELS porousmediumflow co2 parallel LABELS porousmediumflow co2 parallel
TIMEOUT 1200 TIMEOUT 3600
CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )" CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100} CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
...@@ -55,6 +57,7 @@ dumux_add_test(NAME test_co2_tpfa_parallel ...@@ -55,6 +57,7 @@ dumux_add_test(NAME test_co2_tpfa_parallel
dumux_add_test(NAME test_co2ni_box dumux_add_test(NAME test_co2ni_box
SOURCES main.cc SOURCES main.cc
LABELS porousmediumflow co2 co2ni LABELS porousmediumflow co2 co2ni
TIMEOUT 3600
COMPILE_DEFINITIONS TYPETAG=HeterogeneousNIBox ISOTHERMAL=0 COMPILE_DEFINITIONS TYPETAG=HeterogeneousNIBox ISOTHERMAL=0
CMAKE_GUARD "( dune-alugrid_FOUND )" CMAKE_GUARD "( dune-alugrid_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
...@@ -67,6 +70,7 @@ dumux_add_test(NAME test_co2ni_box ...@@ -67,6 +70,7 @@ dumux_add_test(NAME test_co2ni_box
dumux_add_test(NAME test_co2ni_tpfa dumux_add_test(NAME test_co2ni_tpfa
SOURCES main.cc SOURCES main.cc
LABELS porousmediumflow co2 co2ni LABELS porousmediumflow co2 co2ni
TIMEOUT 3600
COMPILE_DEFINITIONS TYPETAG=HeterogeneousNICCTpfa PUBLIC ISOTHERMAL=0 COMPILE_DEFINITIONS TYPETAG=HeterogeneousNICCTpfa PUBLIC ISOTHERMAL=0
CMAKE_GUARD "( dune-alugrid_FOUND )" CMAKE_GUARD "( dune-alugrid_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
...@@ -78,7 +82,7 @@ dumux_add_test(NAME test_co2ni_tpfa ...@@ -78,7 +82,7 @@ dumux_add_test(NAME test_co2ni_tpfa
dumux_add_test(NAME test_co2ni_box_parallel dumux_add_test(NAME test_co2ni_box_parallel
TARGET test_co2ni_box TARGET test_co2ni_box
LABELS porousmediumflow co2 co2ni parallel LABELS porousmediumflow co2 co2ni parallel
TIMEOUT 1200 TIMEOUT 3600
CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )" CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100,"porosity":1} CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100,"porosity":1}
...@@ -89,7 +93,7 @@ dumux_add_test(NAME test_co2ni_box_parallel ...@@ -89,7 +93,7 @@ dumux_add_test(NAME test_co2ni_box_parallel
dumux_add_test(NAME test_co2ni_tpfa_parallel dumux_add_test(NAME test_co2ni_tpfa_parallel
TARGET test_co2ni_tpfa TARGET test_co2ni_tpfa
LABELS porousmediumflow co2 co2ni parallel LABELS porousmediumflow co2 co2ni parallel
TIMEOUT 1200 TIMEOUT 3600
CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )" CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100} CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
......
...@@ -16,6 +16,7 @@ dumux_add_test(NAME test_richards_benchmark_infiltration_tpfa ...@@ -16,6 +16,7 @@ dumux_add_test(NAME test_richards_benchmark_infiltration_tpfa
TARGET test_richards_benchmark_tpfa TARGET test_richards_benchmark_tpfa
CMAKE_GUARD HAVE_UMFPACK CMAKE_GUARD HAVE_UMFPACK
LABELS porousmediumflow richards LABELS porousmediumflow richards
TIMEOUT 3600
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzyData CMD_ARGS --script fuzzyData
--relative 0.05 --relative 0.05
...@@ -50,6 +51,7 @@ dumux_add_test(NAME test_richards_benchmark_evaporation_tpfa ...@@ -50,6 +51,7 @@ dumux_add_test(NAME test_richards_benchmark_evaporation_tpfa
TARGET test_richards_benchmark_tpfa TARGET test_richards_benchmark_tpfa
CMAKE_GUARD HAVE_UMFPACK CMAKE_GUARD HAVE_UMFPACK
LABELS porousmediumflow richards LABELS porousmediumflow richards
TIMEOUT 3600
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzyData CMD_ARGS --script fuzzyData
--files ${CMAKE_SOURCE_DIR}/test/references/test_richards_benchmark_tpfa_rate_analytical_clay.dat --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_benchmark_tpfa_rate_analytical_clay.dat
......
...@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "params.input") ...@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "params.input")
dumux_add_test(NAME test_tracer_multiphase_tpfa dumux_add_test(NAME test_tracer_multiphase_tpfa
LABELS porousmediumflow tracer LABELS porousmediumflow tracer
TIMEOUT 3600
SOURCES main.cc SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
...@@ -12,6 +13,7 @@ dumux_add_test(NAME test_tracer_multiphase_tpfa ...@@ -12,6 +13,7 @@ dumux_add_test(NAME test_tracer_multiphase_tpfa
dumux_add_test(NAME test_tracer_multiphase_mpfa dumux_add_test(NAME test_tracer_multiphase_mpfa
LABELS porousmediumflow tracer LABELS porousmediumflow tracer
TIMEOUT 3600
SOURCES main.cc SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=TracerTestMpfa COMPILE_DEFINITIONS TYPETAG=TracerTestMpfa
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
......
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