From 4f34fa940519e9bc71a6dc85383ae4285c74a56b Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Tue, 5 Jul 2022 09:08:12 +0000 Subject: [PATCH] Merge branch 'feature/test-lecture-timeouts' into 'master' [lecture] Set/increase timeouts for tests See merge request dumux-repositories/dumux-lecture!183 (cherry picked from commit 2617c2bb30b705f77670452c5b1b5127bca7ba24) c416b3f0 [lecture] Set/increase timeouts for tests --- lecture/common/CMakeLists.txt | 1 + lecture/efm/1p2c_2p_2p2c/CMakeLists.txt | 3 +++ lecture/efm/1p2cvs2p/CMakeLists.txt | 2 ++ lecture/efm/2p/CMakeLists.txt | 1 + lecture/mm/fractures/CMakeLists.txt | 1 + lecture/mm/heatpipe/CMakeLists.txt | 1 + lecture/mm/henryproblem/henry1p2c/CMakeLists.txt | 1 + lecture/mm/henryproblem/henry2p/CMakeLists.txt | 1 + lecture/mm/naplinfiltration/3p/CMakeLists.txt | 1 + lecture/mm/naplinfiltration/3p3c/CMakeLists.txt | 1 + 10 files changed, 13 insertions(+) diff --git a/lecture/common/CMakeLists.txt b/lecture/common/CMakeLists.txt index e69de29..8b13789 100644 --- a/lecture/common/CMakeLists.txt +++ b/lecture/common/CMakeLists.txt @@ -0,0 +1 @@ + diff --git a/lecture/efm/1p2c_2p_2p2c/CMakeLists.txt b/lecture/efm/1p2c_2p_2p2c/CMakeLists.txt index 4d09d31..fecd35f 100644 --- a/lecture/efm/1p2c_2p_2p2c/CMakeLists.txt +++ b/lecture/efm/1p2c_2p_2p2c/CMakeLists.txt @@ -1,6 +1,7 @@ add_input_file_links() dumux_add_test(NAME lens2pexercise3 + TIMEOUT 1800 SOURCES lens2pexercise3.cc COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -9,6 +10,7 @@ dumux_add_test(NAME lens2pexercise3 --command "${CMAKE_CURRENT_BINARY_DIR}/lens2pexercise3 -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/exercise3.input -Problem.Name lens-2p") dumux_add_test(NAME lens2p2cexercise3 + TIMEOUT 1800 SOURCES lens2p2cexercise3.cc COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -17,6 +19,7 @@ dumux_add_test(NAME lens2p2cexercise3 --command "${CMAKE_CURRENT_BINARY_DIR}/lens2p2cexercise3 -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/exercise3.input -Problem.Name lens-2p2c -SpatialParams.Temperature 313.15") dumux_add_test(NAME lens1p2cexercise3 + TIMEOUT 1800 SOURCES lens1p2cexercise3.cc COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py CMD_ARGS --script fuzzy diff --git a/lecture/efm/1p2cvs2p/CMakeLists.txt b/lecture/efm/1p2cvs2p/CMakeLists.txt index cf38fb0..e808b34 100644 --- a/lecture/efm/1p2cvs2p/CMakeLists.txt +++ b/lecture/efm/1p2cvs2p/CMakeLists.txt @@ -1,6 +1,7 @@ add_input_file_links() dumux_add_test(NAME lens1p2cexercise1 + TIMEOUT 1800 SOURCES lens1p2cexercise1.cc COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py CMD_ARGS --script fuzzy @@ -10,6 +11,7 @@ dumux_add_test(NAME lens1p2cexercise1 --zeroThreshold {"x^N2_liq":1e-18,"X^N2_liq":1e-18}) dumux_add_test(NAME lens2pexercise1 + TIMEOUT 1800 SOURCES lens2pexercise1.cc COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py CMD_ARGS --script fuzzy diff --git a/lecture/efm/2p/CMakeLists.txt b/lecture/efm/2p/CMakeLists.txt index e43dcbd..ce597af 100644 --- a/lecture/efm/2p/CMakeLists.txt +++ b/lecture/efm/2p/CMakeLists.txt @@ -1,6 +1,7 @@ add_input_file_links() dumux_add_test(NAME lens2pexercise2 + TIMEOUT 1800 SOURCES lens2pexercise2.cc COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py CMD_ARGS --script fuzzy diff --git a/lecture/mm/fractures/CMakeLists.txt b/lecture/mm/fractures/CMakeLists.txt index 64a7575..fc3b711 100644 --- a/lecture/mm/fractures/CMakeLists.txt +++ b/lecture/mm/fractures/CMakeLists.txt @@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "grids" "fracture_exercise.input" "plot.p") # test for the exercise dumux_add_test(NAME fracture_exercise + TIMEOUT 1800 CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )" SOURCES fractures.cc COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py diff --git a/lecture/mm/heatpipe/CMakeLists.txt b/lecture/mm/heatpipe/CMakeLists.txt index bd97ed9..cc37b1d 100644 --- a/lecture/mm/heatpipe/CMakeLists.txt +++ b/lecture/mm/heatpipe/CMakeLists.txt @@ -2,6 +2,7 @@ add_input_file_links() dune_symlink_to_source_files(FILES grids) dumux_add_test(NAME heatpipe + TIMEOUT 1800 SOURCES heatpipe.cc COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py CMD_ARGS --script fuzzy diff --git a/lecture/mm/henryproblem/henry1p2c/CMakeLists.txt b/lecture/mm/henryproblem/henry1p2c/CMakeLists.txt index fb633db..c96ea1b 100644 --- a/lecture/mm/henryproblem/henry1p2c/CMakeLists.txt +++ b/lecture/mm/henryproblem/henry1p2c/CMakeLists.txt @@ -2,6 +2,7 @@ add_input_file_links() dune_symlink_to_source_files(FILES grids) dumux_add_test(NAME henry1p2c + TIMEOUT 1800 SOURCES henry1p2c.cc COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py CMD_ARGS --script fuzzy diff --git a/lecture/mm/henryproblem/henry2p/CMakeLists.txt b/lecture/mm/henryproblem/henry2p/CMakeLists.txt index 7cdfbd6..bb1f425 100644 --- a/lecture/mm/henryproblem/henry2p/CMakeLists.txt +++ b/lecture/mm/henryproblem/henry2p/CMakeLists.txt @@ -2,6 +2,7 @@ add_input_file_links() dune_symlink_to_source_files(FILES grids) dumux_add_test(NAME henry2p + TIMEOUT 1800 SOURCES henry2p.cc COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py CMD_ARGS --script fuzzy diff --git a/lecture/mm/naplinfiltration/3p/CMakeLists.txt b/lecture/mm/naplinfiltration/3p/CMakeLists.txt index e73378e..b27016a 100644 --- a/lecture/mm/naplinfiltration/3p/CMakeLists.txt +++ b/lecture/mm/naplinfiltration/3p/CMakeLists.txt @@ -2,6 +2,7 @@ add_input_file_links() # for the test only simulate one week dumux_add_test(NAME naplinfiltration3p + TIMEOUT 1800 SOURCES naplinfiltration3p.cc COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py CMD_ARGS --script fuzzy diff --git a/lecture/mm/naplinfiltration/3p3c/CMakeLists.txt b/lecture/mm/naplinfiltration/3p3c/CMakeLists.txt index 565d7f7..7f0f216 100644 --- a/lecture/mm/naplinfiltration/3p3c/CMakeLists.txt +++ b/lecture/mm/naplinfiltration/3p3c/CMakeLists.txt @@ -2,6 +2,7 @@ add_input_file_links() # for the test only simulate one week dumux_add_test(NAME naplinfiltration3p3c + TIMEOUT 1800 SOURCES naplinfiltration3p3c.cc COMMAND ${dumux_INCLUDE_DIRS}/bin/testing/runtest.py CMD_ARGS --script fuzzy -- GitLab