From a5b0b36aedfc458a1c456cae16f56dfe8ffe3690 Mon Sep 17 00:00:00 2001 From: Bernd Flemisch Date: Tue, 28 Aug 2018 13:05:37 +0200 Subject: [PATCH] [test] add CMake guards for tests using UMFPack --- .../facet/1p_1p/analytical/CMakeLists.txt | 4 +-- .../poromechanics/el2p/CMakeLists.txt | 1 + .../tracer/1ptracer/CMakeLists.txt | 1 + .../tracer/constvel/CMakeLists.txt | 32 +++++++++++-------- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/test/multidomain/facet/1p_1p/analytical/CMakeLists.txt b/test/multidomain/facet/1p_1p/analytical/CMakeLists.txt index 23322845d3..0ecd2202e3 100644 --- a/test/multidomain/facet/1p_1p/analytical/CMakeLists.txt +++ b/test/multidomain/facet/1p_1p/analytical/CMakeLists.txt @@ -9,13 +9,13 @@ add_executable(test_facetcoupling_box_1p1p EXCLUDE_FROM_ALL test_facetcoupling_f target_compile_definitions(test_facetcoupling_box_1p1p PUBLIC BULKTYPETAG=OnePBulkBox LOWDIMTYPETAG=OnePLowDimBox) dune_add_test(NAME test_facet_1p1p_tpfa_convergence - CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND AND gmsh_FOUND )" + CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND AND gmsh_FOUND AND HAVE_UMFPACK )" TARGET test_facetcoupling_tpfa_1p1p COMMAND ./convergencetest.py CMD_ARGS test_facetcoupling_tpfa_1p1p 1e-4) dune_add_test(NAME test_facet_1p1p_box_convergence - CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND AND gmsh_FOUND )" + CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND AND gmsh_FOUND AND HAVE_UMFPACK )" TARGET test_facetcoupling_box_1p1p COMMAND ./convergencetest.py CMD_ARGS test_facetcoupling_box_1p1p 1e-4) diff --git a/test/multidomain/poromechanics/el2p/CMakeLists.txt b/test/multidomain/poromechanics/el2p/CMakeLists.txt index acedd5ac34..0c2d045221 100644 --- a/test/multidomain/poromechanics/el2p/CMakeLists.txt +++ b/test/multidomain/poromechanics/el2p/CMakeLists.txt @@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "el2p.input") dune_add_test(NAME test_el2p SOURCES test_el2p.cc + CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/el2p_2p_reference.vtu diff --git a/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt b/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt index f30af80e41..de686fc4cf 100644 --- a/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt +++ b/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt @@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "tracer.input") dune_add_test(NAME test_tracer_sequential SOURCES test_cctracer.cc + CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/tracer-sequential-transport-reference.vtu diff --git a/test/porousmediumflow/tracer/constvel/CMakeLists.txt b/test/porousmediumflow/tracer/constvel/CMakeLists.txt index 9d9a758c2a..144fddfe01 100644 --- a/test/porousmediumflow/tracer/constvel/CMakeLists.txt +++ b/test/porousmediumflow/tracer/constvel/CMakeLists.txt @@ -4,6 +4,7 @@ dune_symlink_to_source_files(FILES "test_tracer.input") dune_add_test(NAME test_tracer_explicit_tpfa SOURCES test_tracer.cc COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=false USEMOLES=false + CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-explicit-cc-reference.vtu @@ -13,6 +14,7 @@ dune_add_test(NAME test_tracer_explicit_tpfa dune_add_test(NAME test_tracer_explicit_box SOURCES test_tracer.cc COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=false USEMOLES=false + CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-explicit-box-reference.vtu @@ -21,27 +23,30 @@ dune_add_test(NAME test_tracer_explicit_box # explicit tracer tests (mole fractions, should yield same result) dune_add_test(NAME test_tracer_explicit_tpfa_mol - SOURCES test_tracer.cc - COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=false USEMOLES=true - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-explicit-cc-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/tracer_explicit_tpfa_mol-00010.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa test_tracer.input -Problem.Name tracer_explicit_tpfa_mol") + SOURCES test_tracer.cc + COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=false USEMOLES=true + CMAKE_GUARD HAVE_UMFPACK + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-explicit-cc-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/tracer_explicit_tpfa_mol-00010.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa test_tracer.input -Problem.Name tracer_explicit_tpfa_mol") dune_add_test(NAME test_tracer_explicit_box_mol - SOURCES test_tracer.cc - COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=false USEMOLES=true - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-explicit-box-reference.vtu + SOURCES test_tracer.cc + COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=false USEMOLES=true + CMAKE_GUARD HAVE_UMFPACK + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-explicit-box-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/tracer_explicit_box_mol-00010.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box test_tracer.input -Problem.Name tracer_explicit_box_mol") + --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_box test_tracer.input -Problem.Name tracer_explicit_box_mol") # implicit tracer tests dune_add_test(NAME test_tracer_implicit_tpfa SOURCES test_tracer.cc COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=true USEMOLES=false + CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-implicit-cc-reference.vtu @@ -51,6 +56,7 @@ dune_add_test(NAME test_tracer_implicit_tpfa dune_add_test(NAME test_tracer_implicit_box SOURCES test_tracer.cc COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=true USEMOLES=false + CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy --files ${CMAKE_SOURCE_DIR}/test/references/tracer-constvel-implicit-box-reference.vtu -- GitLab