From adee0a16498c03dd72f8619024e51b66d1ea99d2 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 14 Feb 2018 16:04:34 +0100 Subject: [PATCH] changed: let the build system handle the dynamic boost test defines --- tests/test_anisotropiceikonal.cpp | 3 --- tests/test_autodiffhelpers.cpp | 4 ---- tests/test_autodiffmatrix.cpp | 4 ---- tests/test_blackoilstate.cpp | 3 --- tests/test_block.cpp | 4 ---- tests/test_boprops_ad.cpp | 4 ---- tests/test_dgbasis.cpp | 3 --- tests/test_equil_legacy.cpp | 5 ----- tests/test_event.cpp | 5 ----- tests/test_flowdiagnostics.cpp | 3 --- tests/test_invert.cpp | 4 ---- tests/test_linearsolver.cpp | 3 --- tests/test_multiphaseupwind.cpp | 4 ---- tests/test_norne_pvt.cpp | 3 --- tests/test_parallel_linearsolver.cpp | 3 --- tests/test_parallelistlinformation.cpp | 3 --- tests/test_pinchprocessor.cpp | 4 ---- tests/test_rateconverter.cpp | 4 ---- tests/test_relpermdiagnostics.cpp | 5 ----- tests/test_satfunc.cpp | 5 ----- tests/test_scalar_mult.cpp | 4 ---- tests/test_shadow.cpp | 3 --- tests/test_span.cpp | 4 ---- tests/test_stoppedwells.cpp | 4 ---- tests/test_syntax.cpp | 4 ---- tests/test_timer.cpp | 4 ---- tests/test_transmissibilitymultipliers.cpp | 4 ---- tests/test_vfpproperties.cpp | 4 ---- tests/test_wellcollection.cpp | 4 ---- tests/test_wellcontrols.cpp | 4 ---- tests/test_welldensitysegmented.cpp | 4 ---- tests/test_wellmodel.cpp | 4 ---- tests/test_wells.cpp | 4 ---- tests/test_wellsgroup.cpp | 4 ---- tests/test_wellsmanager.cpp | 4 ---- tests/test_wellswitchlogger.cpp | 3 --- 36 files changed, 138 deletions(-) diff --git a/tests/test_anisotropiceikonal.cpp b/tests/test_anisotropiceikonal.cpp index e7174841a..13fe31727 100644 --- a/tests/test_anisotropiceikonal.cpp +++ b/tests/test_anisotropiceikonal.cpp @@ -19,9 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif #define NVERBOSE // to suppress our messages when throwing #define BOOST_TEST_MODULE AnisotropicEikonalTest diff --git a/tests/test_autodiffhelpers.cpp b/tests/test_autodiffhelpers.cpp index 46e5048f5..8f7744dfe 100644 --- a/tests/test_autodiffhelpers.cpp +++ b/tests/test_autodiffhelpers.cpp @@ -19,10 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define BOOST_TEST_MODULE AutoDiffHelpersTest #include diff --git a/tests/test_autodiffmatrix.cpp b/tests/test_autodiffmatrix.cpp index 7c10fbc56..b0ffbb054 100644 --- a/tests/test_autodiffmatrix.cpp +++ b/tests/test_autodiffmatrix.cpp @@ -19,10 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define BOOST_TEST_MODULE AutoDiffMatrixTest #include diff --git a/tests/test_blackoilstate.cpp b/tests/test_blackoilstate.cpp index 5858de4a6..ec49a520a 100644 --- a/tests/test_blackoilstate.cpp +++ b/tests/test_blackoilstate.cpp @@ -8,9 +8,6 @@ #include #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif #define NVERBOSE // to suppress our messages when throwing #define BOOST_TEST_MODULE BlackoilStateTest #define BOOST_TEST_MAIN diff --git a/tests/test_block.cpp b/tests/test_block.cpp index ad3eda5fc..ae1f91ff5 100644 --- a/tests/test_block.cpp +++ b/tests/test_block.cpp @@ -20,10 +20,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define BOOST_TEST_MODULE AutoDiffBlockTest #include diff --git a/tests/test_boprops_ad.cpp b/tests/test_boprops_ad.cpp index 8f13b92da..432e7edf5 100644 --- a/tests/test_boprops_ad.cpp +++ b/tests/test_boprops_ad.cpp @@ -20,10 +20,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define BOOST_TEST_MODULE FluidPropertiesTest #include diff --git a/tests/test_dgbasis.cpp b/tests/test_dgbasis.cpp index 0f7316d9f..87a08ed0a 100644 --- a/tests/test_dgbasis.cpp +++ b/tests/test_dgbasis.cpp @@ -19,9 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif #define NVERBOSE // to suppress our messages when throwing #define BOOST_TEST_MODULE DGBasisTest diff --git a/tests/test_equil_legacy.cpp b/tests/test_equil_legacy.cpp index 101171a15..829dc41f7 100644 --- a/tests/test_equil_legacy.cpp +++ b/tests/test_equil_legacy.cpp @@ -4,11 +4,6 @@ #include "config.h" -/* --- Boost.Test boilerplate --- */ -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define NVERBOSE // Suppress own messages when throw()ing #define BOOST_TEST_MODULE UnitsTest diff --git a/tests/test_event.cpp b/tests/test_event.cpp index a5179cdb3..e3d52720a 100644 --- a/tests/test_event.cpp +++ b/tests/test_event.cpp @@ -3,11 +3,6 @@ */ #include -/* --- Boost.Test boilerplate --- */ -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define NVERBOSE // Suppress own messages when throw()ing #define BOOST_TEST_MODULE EventTest diff --git a/tests/test_flowdiagnostics.cpp b/tests/test_flowdiagnostics.cpp index a98cd33b6..8fca91826 100644 --- a/tests/test_flowdiagnostics.cpp +++ b/tests/test_flowdiagnostics.cpp @@ -19,9 +19,6 @@ #include -#if defined(HAVE_DYNAMIC_BOOST_TEST) -#define BOOST_TEST_DYN_LINK -#endif #define NVERBOSE // to suppress our messages when throwing diff --git a/tests/test_invert.cpp b/tests/test_invert.cpp index b6690663f..77fad8956 100644 --- a/tests/test_invert.cpp +++ b/tests/test_invert.cpp @@ -19,10 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define BOOST_TEST_MODULE InvertSpecializationTest #include #include diff --git a/tests/test_linearsolver.cpp b/tests/test_linearsolver.cpp index efddd6a5a..6ae6bfecb 100644 --- a/tests/test_linearsolver.cpp +++ b/tests/test_linearsolver.cpp @@ -19,9 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif #define NVERBOSE // to suppress our messages when throwing #define BOOST_TEST_MODULE OPM-IterativeSolverTest diff --git a/tests/test_multiphaseupwind.cpp b/tests/test_multiphaseupwind.cpp index cac7fc806..3202382b5 100644 --- a/tests/test_multiphaseupwind.cpp +++ b/tests/test_multiphaseupwind.cpp @@ -20,10 +20,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define NVERBOSE // Suppress own messages when throw()ing #define BOOST_TEST_MODULE OPM-multiPhaseUpwind diff --git a/tests/test_norne_pvt.cpp b/tests/test_norne_pvt.cpp index 6fd3361f7..d4c87ce7e 100644 --- a/tests/test_norne_pvt.cpp +++ b/tests/test_norne_pvt.cpp @@ -19,9 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif #define BOOST_TEST_MODULE NORNE_PVT_TESTS #include diff --git a/tests/test_parallel_linearsolver.cpp b/tests/test_parallel_linearsolver.cpp index be318565b..026cb278f 100644 --- a/tests/test_parallel_linearsolver.cpp +++ b/tests/test_parallel_linearsolver.cpp @@ -19,9 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif #define NVERBOSE // to suppress our messages when throwing #define BOOST_TEST_MODULE OPM-ParallelIterativeSolverTest diff --git a/tests/test_parallelistlinformation.cpp b/tests/test_parallelistlinformation.cpp index f0a07283e..8785d29b7 100644 --- a/tests/test_parallelistlinformation.cpp +++ b/tests/test_parallelistlinformation.cpp @@ -21,9 +21,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif #define NVERBOSE // to suppress our messages when throwing #define BOOST_TEST_MODULE OPM-ParallelIstlInformation diff --git a/tests/test_pinchprocessor.cpp b/tests/test_pinchprocessor.cpp index 81cc7ff26..1d27ac77d 100644 --- a/tests/test_pinchprocessor.cpp +++ b/tests/test_pinchprocessor.cpp @@ -19,10 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define NVERBOSE // Suppress own messages when throw()in #define BOOST_TEST_MODULE PinchProcessorTest diff --git a/tests/test_rateconverter.cpp b/tests/test_rateconverter.cpp index 8fd10a83f..c8cddd4b4 100644 --- a/tests/test_rateconverter.cpp +++ b/tests/test_rateconverter.cpp @@ -20,10 +20,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define BOOST_TEST_MODULE VoidageRateConversionTest #include diff --git a/tests/test_relpermdiagnostics.cpp b/tests/test_relpermdiagnostics.cpp index a1eed9936..986bb9d50 100644 --- a/tests/test_relpermdiagnostics.cpp +++ b/tests/test_relpermdiagnostics.cpp @@ -19,11 +19,6 @@ #include "config.h" -/* --- Boost.Test boilerplate --- */ -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define NVERBOSE // Suppress own messages when throw()ing #define BOOST_TEST_MODULE RelpermDiagnostics diff --git a/tests/test_satfunc.cpp b/tests/test_satfunc.cpp index 86b8e3e05..456ae181d 100644 --- a/tests/test_satfunc.cpp +++ b/tests/test_satfunc.cpp @@ -4,11 +4,6 @@ #include "config.h" -/* --- Boost.Test boilerplate --- */ -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define NVERBOSE // Suppress own messages when throw()ing #define BOOST_TEST_MODULE UnitsTest diff --git a/tests/test_scalar_mult.cpp b/tests/test_scalar_mult.cpp index aa2741aac..710ff6c36 100644 --- a/tests/test_scalar_mult.cpp +++ b/tests/test_scalar_mult.cpp @@ -19,10 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define BOOST_TEST_MODULE AutoDiffBlockTest #include diff --git a/tests/test_shadow.cpp b/tests/test_shadow.cpp index 0b80fd65a..00cf7959f 100644 --- a/tests/test_shadow.cpp +++ b/tests/test_shadow.cpp @@ -2,9 +2,6 @@ This file is licensed under the GNU General Public License v3.0 or later. */ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif #define NVERBOSE // to suppress our messages when throwing #define BOOST_TEST_MODULE ShadowTest diff --git a/tests/test_span.cpp b/tests/test_span.cpp index 5ddee5695..c1cb155f7 100644 --- a/tests/test_span.cpp +++ b/tests/test_span.cpp @@ -20,10 +20,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define BOOST_TEST_MODULE SpanTest #include diff --git a/tests/test_stoppedwells.cpp b/tests/test_stoppedwells.cpp index 9e40f1e72..b2b38fd1a 100644 --- a/tests/test_stoppedwells.cpp +++ b/tests/test_stoppedwells.cpp @@ -19,10 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define BOOST_TEST_MODULE StoppedWellsTests #include diff --git a/tests/test_syntax.cpp b/tests/test_syntax.cpp index cc93157bc..f0b71cb7d 100644 --- a/tests/test_syntax.cpp +++ b/tests/test_syntax.cpp @@ -1,9 +1,5 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define BOOST_TEST_MODULE SyntaxTest #include diff --git a/tests/test_timer.cpp b/tests/test_timer.cpp index 6394227b4..4b3468c56 100644 --- a/tests/test_timer.cpp +++ b/tests/test_timer.cpp @@ -19,10 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define NVERBOSE // Suppress own messages when throw()ing #define BOOST_TEST_MODULE OPM-TimerTest diff --git a/tests/test_transmissibilitymultipliers.cpp b/tests/test_transmissibilitymultipliers.cpp index 246de90dc..786bc33f2 100644 --- a/tests/test_transmissibilitymultipliers.cpp +++ b/tests/test_transmissibilitymultipliers.cpp @@ -18,10 +18,6 @@ */ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define BOOST_TEST_MODULE TransmissibilityMultipliers #include diff --git a/tests/test_vfpproperties.cpp b/tests/test_vfpproperties.cpp index c9949e9f2..e98c1c580 100644 --- a/tests/test_vfpproperties.cpp +++ b/tests/test_vfpproperties.cpp @@ -20,10 +20,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define BOOST_TEST_MODULE AutoDiffBlockTest #include diff --git a/tests/test_wellcollection.cpp b/tests/test_wellcollection.cpp index 43fd4f773..7db34cc9e 100644 --- a/tests/test_wellcollection.cpp +++ b/tests/test_wellcollection.cpp @@ -19,10 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define NVERBOSE // Suppress own messages when throw()ing #define BOOST_TEST_MODULE WellCollectionTest diff --git a/tests/test_wellcontrols.cpp b/tests/test_wellcontrols.cpp index 8827c7bc9..bd91cb6e8 100644 --- a/tests/test_wellcontrols.cpp +++ b/tests/test_wellcontrols.cpp @@ -19,10 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define NVERBOSE // Suppress own messages when throw()ing #define BOOST_TEST_MODULE WellsModuleTest diff --git a/tests/test_welldensitysegmented.cpp b/tests/test_welldensitysegmented.cpp index 520dc43ce..eeb2483cb 100644 --- a/tests/test_welldensitysegmented.cpp +++ b/tests/test_welldensitysegmented.cpp @@ -20,10 +20,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define BOOST_TEST_MODULE WellDensitySegmentedTest #include diff --git a/tests/test_wellmodel.cpp b/tests/test_wellmodel.cpp index 6a805ae8d..ee2f6359e 100644 --- a/tests/test_wellmodel.cpp +++ b/tests/test_wellmodel.cpp @@ -21,10 +21,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define BOOST_TEST_MODULE WellModelTest #include diff --git a/tests/test_wells.cpp b/tests/test_wells.cpp index 4c4f102b9..b36d26124 100644 --- a/tests/test_wells.cpp +++ b/tests/test_wells.cpp @@ -19,10 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define NVERBOSE // Suppress own messages when throw()ing #define BOOST_TEST_MODULE WellsModuleTest diff --git a/tests/test_wellsgroup.cpp b/tests/test_wellsgroup.cpp index 36743aea2..10925e989 100644 --- a/tests/test_wellsgroup.cpp +++ b/tests/test_wellsgroup.cpp @@ -19,10 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define NVERBOSE // Suppress own messages when throw()ing #define BOOST_TEST_MODULE WellsGroupTest diff --git a/tests/test_wellsmanager.cpp b/tests/test_wellsmanager.cpp index 6efc8dc26..94ad2e436 100644 --- a/tests/test_wellsmanager.cpp +++ b/tests/test_wellsmanager.cpp @@ -19,10 +19,6 @@ #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif - #define NVERBOSE // Suppress own messages when throw()ing #define BOOST_TEST_MODULE WellsManagerTests diff --git a/tests/test_wellswitchlogger.cpp b/tests/test_wellswitchlogger.cpp index 6e1252111..206ec17d8 100644 --- a/tests/test_wellswitchlogger.cpp +++ b/tests/test_wellswitchlogger.cpp @@ -1,9 +1,6 @@ #include #include -#if HAVE_DYNAMIC_BOOST_TEST -#define BOOST_TEST_DYN_LINK -#endif #define BOOST_TEST_MODULE DistributedCpGridTests #define BOOST_TEST_NO_MAIN