From 627c7d50acbab70dca7c8a8a5f3bc8379b335e32 Mon Sep 17 00:00:00 2001 From: Tong Dong Qiu Date: Thu, 3 Nov 2022 15:46:59 +0100 Subject: [PATCH] Removed outdated version checks --- tests/test_cusparseSolver.cpp | 17 ----------------- tests/test_flexiblesolver.cpp | 16 ---------------- tests/test_openclSolver.cpp | 17 ----------------- tests/test_preconditionerfactory.cpp | 18 ------------------ 4 files changed, 68 deletions(-) diff --git a/tests/test_cusparseSolver.cpp b/tests/test_cusparseSolver.cpp index 2b0b2ed5e..322132509 100644 --- a/tests/test_cusparseSolver.cpp +++ b/tests/test_cusparseSolver.cpp @@ -22,12 +22,6 @@ #define BOOST_TEST_MODULE OPM_test_cusparseSolver #include -#include - -#include - -#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6) && \ - BOOST_VERSION / 100 % 1000 > 48 #include #include @@ -175,14 +169,3 @@ BOOST_AUTO_TEST_CASE(TestCusparseSolver) BOOST_WARN_MESSAGE(true, "Problem with initializing a device. skipping test"); } } - - -#else - -// Do nothing if we do not have at least Dune 2.6. -BOOST_AUTO_TEST_CASE(DummyTest) -{ - BOOST_REQUIRE(true); -} - -#endif diff --git a/tests/test_flexiblesolver.cpp b/tests/test_flexiblesolver.cpp index c4ad6e3d3..a648ed05c 100644 --- a/tests/test_flexiblesolver.cpp +++ b/tests/test_flexiblesolver.cpp @@ -21,12 +21,6 @@ #define BOOST_TEST_MODULE OPM_test_FlexibleSolver #include -#include - -#include - -#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6) && \ - BOOST_VERSION / 100 % 1000 > 48 #include #include @@ -124,13 +118,3 @@ BOOST_AUTO_TEST_CASE(TestFlexibleSolver) } } } - -#else - -// Do nothing if we do not have at least Dune 2.6. -BOOST_AUTO_TEST_CASE(DummyTest) -{ - BOOST_REQUIRE(true); -} - -#endif diff --git a/tests/test_openclSolver.cpp b/tests/test_openclSolver.cpp index 4280336be..16163d30c 100644 --- a/tests/test_openclSolver.cpp +++ b/tests/test_openclSolver.cpp @@ -22,12 +22,6 @@ #define BOOST_TEST_MODULE OPM_test_openclSolver #include -#include - -#include - -#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6) && \ - BOOST_VERSION / 100 % 1000 > 48 #include #include @@ -206,14 +200,3 @@ BOOST_AUTO_TEST_CASE(TestOpenclSolver) BOOST_WARN_MESSAGE(true, "Problem with initializing Platform. skipping test"); } } - - -#else - -// Do nothing if we do not have at least Dune 2.6. -BOOST_AUTO_TEST_CASE(DummyTest) -{ - BOOST_REQUIRE(true); -} - -#endif diff --git a/tests/test_preconditionerfactory.cpp b/tests/test_preconditionerfactory.cpp index cb91c7989..468b94926 100644 --- a/tests/test_preconditionerfactory.cpp +++ b/tests/test_preconditionerfactory.cpp @@ -21,12 +21,6 @@ #define BOOST_TEST_MODULE OPM_test_PreconditionerFactory #include -#include - -#include - -#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6) && \ - BOOST_VERSION / 100 % 1000 > 48 #include #include @@ -370,15 +364,3 @@ BOOST_AUTO_TEST_CASE(TestWithRepeatingOperator) // Test with 3x3 block solvers. test3rep(prm); } - - - -#else - -// Do nothing if we do not have at least Dune 2.6. -BOOST_AUTO_TEST_CASE(DummyTest) -{ - BOOST_REQUIRE(true); -} - -#endif