From 68ea8d6a40cb52cdabcb303f310d4003aadda2ef Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Sat, 30 Dec 2017 18:11:31 +0000 Subject: [PATCH] Multiprecision: split up test_sf_import_c99.cpp some more to avoid over-large object files. --- test/Jamfile.v2 | 4 ++++ test/test_sf_import_c99.cpp | 20 +++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 183b7b55..b4856e2a 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -290,6 +290,9 @@ run test_sf_import_c99.cpp : : : TEST_CPP_DEC_FLOAT_3 : test_sf_import_c run test_sf_import_c99.cpp : : : TEST_CPP_DEC_FLOAT_4 : test_sf_import_c99_cpp_dec_float_4 ; run test_sf_import_c99.cpp : : : TEST_CPP_DEC_FLOAT_5 : test_sf_import_c99_cpp_dec_float_5 ; +run test_sf_import_c99.cpp : : : TEST_CPP_BIN_FLOAT_2 : test_sf_import_c99_cpp_bin_float_2 ; +run test_sf_import_c99.cpp : : : TEST_CPP_BIN_FLOAT_2 : test_sf_import_c99_cpp_bin_float_3 ; + run test_gmp_conversions.cpp gmp no_eh_support : # command line : # input files @@ -1260,6 +1263,7 @@ alias functions_and_limits : test_round_cpp_bin_float test_fpclassify_cpp_bin_float test_sf_import_c99_cpp_bin_float + test_sf_import_c99_cpp_bin_float_2 test_exp_float128 test_log_float128 diff --git a/test/test_sf_import_c99.cpp b/test/test_sf_import_c99.cpp index 2c065476..60c4f7d1 100644 --- a/test/test_sf_import_c99.cpp +++ b/test/test_sf_import_c99.cpp @@ -10,7 +10,7 @@ #if !defined(TEST_MPF_50) && !defined(TEST_MPF) && !defined(TEST_BACKEND) && !defined(TEST_CPP_DEC_FLOAT)\ && !defined(TEST_MPFR) && !defined(TEST_MPFR_50) && !defined(TEST_MPFI_50) && !defined(TEST_FLOAT128)\ && !defined(TEST_CPP_BIN_FLOAT) && !defined(TEST_CPP_DEC_FLOAT_2) && !defined(TEST_CPP_DEC_FLOAT_3)\ - && !defined(TEST_CPP_DEC_FLOAT_4) && !defined(TEST_CPP_DEC_FLOAT_5) + && !defined(TEST_CPP_DEC_FLOAT_4) && !defined(TEST_CPP_DEC_FLOAT_5) && !defined(TEST_CPP_BIN_FLOAT_2) && !defined(TEST_CPP_BIN_FLOAT_3) # define TEST_MPF_50 # define TEST_MPFR_50 # define TEST_MPFI_50 @@ -21,6 +21,8 @@ # define TEST_CPP_DEC_FLOAT_5 # define TEST_FLOAT128 # define TEST_CPP_BIN_FLOAT +# define TEST_CPP_BIN_FLOAT_2 +# define TEST_CPP_BIN_FLOAT_3 #ifdef _MSC_VER #pragma message("CAUTION!!: No backend type specified so testing everything.... this will take some time!!") @@ -43,7 +45,7 @@ #if defined(TEST_CPP_DEC_FLOAT) || defined(TEST_CPP_DEC_FLOAT_2) || defined(TEST_CPP_DEC_FLOAT_3) || defined(TEST_CPP_DEC_FLOAT_4) || defined(TEST_CPP_DEC_FLOAT_5) #include #endif -#ifdef TEST_CPP_BIN_FLOAT +#if defined(TEST_CPP_BIN_FLOAT) || defined(TEST_CPP_BIN_FLOAT_2) || defined(TEST_CPP_BIN_FLOAT_3) #include #include #endif @@ -2055,7 +2057,7 @@ int main() #endif #ifdef TEST_CPP_DEC_FLOAT test(); -#if !(defined(CI_SUPPRESS_KNOWN_ISSUES) && defined(__GNUC__) && defined(_WIN32)) // Object file too large otherwise +#if !(defined(__GNUC__) && defined(_WIN32)) // Object file too large otherwise test(); #endif test_c99_appendix_F(); @@ -2063,32 +2065,36 @@ int main() #ifdef TEST_CPP_DEC_FLOAT_2 // Some "peculiar" digit counts which stress our code: test > >(); -#if !(defined(CI_SUPPRESS_KNOWN_ISSUES) && defined(__GNUC__) && defined(_WIN32)) // Object file too large otherwise +#if !(defined(__GNUC__) && defined(_WIN32)) // Object file too large otherwise test > >(); #endif #endif #ifdef TEST_CPP_DEC_FLOAT_3 test > >(); -#if !(defined(CI_SUPPRESS_KNOWN_ISSUES) && defined(__GNUC__) && defined(_WIN32)) // Object file too large otherwise +#if !(defined(__GNUC__) && defined(_WIN32)) // Object file too large otherwise test > >(); #endif #endif #ifdef TEST_CPP_DEC_FLOAT_4 test > >(); -#if !(defined(CI_SUPPRESS_KNOWN_ISSUES) && defined(__GNUC__) && defined(_WIN32)) // Object file too large otherwise +#if !(defined(__GNUC__) && defined(_WIN32)) // Object file too large otherwise test > >(); #endif #endif #ifdef TEST_CPP_DEC_FLOAT_5 test > > >(); -#if !(defined(CI_SUPPRESS_KNOWN_ISSUES) && defined(__GNUC__) && defined(_WIN32)) // Object file too large otherwise +#if !(defined(__GNUC__) && defined(_WIN32)) // Object file too large otherwise test > > >(); #endif #endif #ifdef TEST_CPP_BIN_FLOAT test(); test, boost::multiprecision::et_on> >(); +#endif +#ifdef TEST_CPP_BIN_FLOAT_2 test, boost::long_long_type> > >(); +#endif +#ifdef TEST_CPP_BIN_FLOAT_3 test_c99_appendix_F(); test_c99_appendix_F, boost::multiprecision::et_on> >(); #endif