From e06292f69f17e5647ca6ea9d690a21c4dc39f66f Mon Sep 17 00:00:00 2001
From: Matt Borland <matt@mattborland.com>
Date: Mon, 6 Mar 2023 10:44:48 -0800
Subject: [PATCH] Conditionally disable MP testing and move to proper test
 suite

---
 test/Jamfile.v2           |  7 ++++---
 test/test_trapezoidal.cpp | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index daff6520e..d412ca10e 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -843,9 +843,6 @@ test-suite distribution_tests :
    [ run test_rayleigh.cpp ../../test/build//boost_unit_test_framework  ]
    [ run test_students_t.cpp ../../test/build//boost_unit_test_framework  ]
    [ run test_skew_normal.cpp ../../test/build//boost_unit_test_framework  ]
-   [ run test_trapezoidal.cpp ../../test/build//boost_unit_test_framework : : :
-         release [ requires cxx11_lambdas cxx11_auto_declarations cxx11_decltype cxx11_unified_initialization_syntax cxx11_variadic_templates ]
-         [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <linkflags>"-Bstatic -lquadmath -Bdynamic" ] ]
    [ run test_triangular.cpp pch ../../test/build//boost_unit_test_framework  ]
    [ run test_uniform.cpp pch ../../test/build//boost_unit_test_framework  ]
    [ run test_weibull.cpp ../../test/build//boost_unit_test_framework  ]
@@ -1470,6 +1467,10 @@ test-suite quadrature :
    [ compile compile_test/gauss_concept_test.cpp : [ requires cxx11_auto_declarations cxx11_lambdas cxx11_smart_ptr cxx11_unified_initialization_syntax ] [ check-target-builds ../config//is_ci_sanitizer_run "Sanitizer CI run" : <build>no ] ]
    [ compile compile_test/gauss_kronrod_concept_test.cpp : [ requires cxx11_auto_declarations cxx11_lambdas cxx11_smart_ptr cxx11_unified_initialization_syntax ] [ check-target-builds ../config//is_ci_sanitizer_run "Sanitizer CI run" : <build>no ] ]
    [ run git_issue_898.cpp ]
+
+   [ run test_trapezoidal.cpp ../../test/build//boost_unit_test_framework : : :
+      release [ requires cxx11_lambdas cxx11_auto_declarations cxx11_decltype cxx11_unified_initialization_syntax cxx11_variadic_templates ]
+      [ check-target-builds ../config//has_float128 "GCC libquadmath and __float128 support" : <linkflags>"-Bstatic -lquadmath -Bdynamic" ] ]
 ;
 
 test-suite autodiff :
diff --git a/test/test_trapezoidal.cpp b/test/test_trapezoidal.cpp
index c94a24c37..dc5eb88ac 100644
--- a/test/test_trapezoidal.cpp
+++ b/test/test_trapezoidal.cpp
@@ -249,8 +249,11 @@ BOOST_AUTO_TEST_CASE(trapezoidal_quadrature)
 #ifndef BOOST_MATH_NO_REAL_CONCEPT_TESTS
     test_rational_periodic<boost::math::concepts::real_concept>();
 #endif
+
+    #ifdef BOOST_MATH_RUN_MP_TESTS
     test_rational_periodic<cpp_bin_float_50>();
     test_rational_periodic<cpp_bin_float_100>();
+    #endif
 
     test_bump_function<float>();
     test_bump_function<double>();
@@ -260,7 +263,10 @@ BOOST_AUTO_TEST_CASE(trapezoidal_quadrature)
 #ifndef BOOST_MATH_NO_REAL_CONCEPT_TESTS
     test_rational_periodic<boost::math::concepts::real_concept>();
 #endif
+
+    #ifdef BOOST_MATH_RUN_MP_TESTS
     test_rational_periodic<cpp_bin_float_50>();
+    #endif
 
     test_zero_function<float>();
     test_zero_function<double>();
@@ -270,8 +276,11 @@ BOOST_AUTO_TEST_CASE(trapezoidal_quadrature)
 #ifndef BOOST_MATH_NO_REAL_CONCEPT_TESTS
     test_zero_function<boost::math::concepts::real_concept>();
 #endif
+
+    #ifdef BOOST_MATH_RUN_MP_TESTS
     test_zero_function<cpp_bin_float_50>();
     test_zero_function<cpp_bin_float_100>();
+    #endif
 
     test_sinsq<float>();
     test_sinsq<double>();
@@ -281,8 +290,11 @@ BOOST_AUTO_TEST_CASE(trapezoidal_quadrature)
 #ifndef BOOST_MATH_NO_REAL_CONCEPT_TESTS
     test_sinsq<boost::math::concepts::real_concept>();
 #endif
+
+    #ifdef BOOST_MATH_RUN_MP_TESTS
     test_sinsq<cpp_bin_float_50>();
     test_sinsq<cpp_bin_float_100>();
+    #endif
 
     test_slowly_converging<float>();
     test_slowly_converging<double>();
@@ -299,7 +311,9 @@ BOOST_AUTO_TEST_CASE(trapezoidal_quadrature)
     test_rational_sin<long double>();
 #endif
     //test_rational_sin<boost::math::concepts::real_concept>();
+    #ifdef BOOST_MATH_RUN_MP_TESTS
     test_rational_sin<cpp_bin_float_50>();
+    #endif
 
     test_complex_bessel<std::complex<float>>();
     test_complex_bessel<std::complex<double>>();