From 97d5ff01e7a7c52e12af92f64d39bfb56a1d1ae2 Mon Sep 17 00:00:00 2001 From: pabristow Date: Fri, 16 Aug 2019 09:44:56 +0100 Subject: [PATCH] [CI SKIP] Change to revert to default filesystem::root; and instead use a change to the jamfile for location of the serials txt files. All tests and examples pass, doc rebuilt, inspect all OK. --- test/Jamfile.v2 | 194 ++++++++++++++++----------------- test/test_cpp_int_deserial.cpp | 2 +- 2 files changed, 98 insertions(+), 98 deletions(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 78e940c4..edf75531 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -234,14 +234,14 @@ test-suite functions_and_limits : : # command line : # input files : # requirements - TEST_BACKEND + TEST_BACKEND : test_numeric_limits_backend_concept ] [ run test_numeric_limits.cpp gmp no_eh_support : # command line : # input files : # requirements - TEST_MPF_50 + TEST_MPF_50 [ check-target-builds ../config//has_gmp : : no ] : test_numeric_limits_mpf50 ] @@ -249,7 +249,7 @@ test-suite functions_and_limits : : # command line : # input files : # requirements - TEST_MPF + TEST_MPF [ check-target-builds ../config//has_gmp : : no ] : test_numeric_limits_mpf ] @@ -257,7 +257,7 @@ test-suite functions_and_limits : : # command line : # input files : # requirements - TEST_MPZ + TEST_MPZ [ check-target-builds ../config//has_gmp : : no ] : test_numeric_limits_mpz ] @@ -265,7 +265,7 @@ test-suite functions_and_limits : : # command line : # input files : # requirements - TEST_MPQ + TEST_MPQ [ check-target-builds ../config//has_gmp : : no ] : test_numeric_limits_mpq ] @@ -273,7 +273,7 @@ test-suite functions_and_limits : : # command line : # input files : # requirements - TEST_MPFR + TEST_MPFR [ check-target-builds ../config//has_mpfr : : no ] : test_numeric_limits_mpfr ] @@ -281,7 +281,7 @@ test-suite functions_and_limits : : # command line : # input files : # requirements - TEST_MPFR_50 + TEST_MPFR_50 [ check-target-builds ../config//has_mpfr : : no ] : test_numeric_limits_mpfr_50 ] @@ -289,21 +289,21 @@ test-suite functions_and_limits : : # command line : # input files : # requirements - TEST_CPP_DEC_FLOAT + TEST_CPP_DEC_FLOAT : test_numeric_limits_cpp_dec_float ] [ run test_numeric_limits.cpp no_eh_support : # command line : # input files : # requirements - TEST_CPP_BIN_FLOAT + TEST_CPP_BIN_FLOAT : test_numeric_limits_cpp_bin_float ] [ run test_numeric_limits.cpp $(TOMMATH) no_eh_support : # command line : # input files : # requirements - TEST_TOMMATH + TEST_TOMMATH [ check-target-builds ../config//has_tommath : : no ] : test_numeric_limits_tommath ] @@ -311,14 +311,14 @@ test-suite functions_and_limits : : # command line : # input files : # requirements - TEST_CPP_INT + TEST_CPP_INT : test_numeric_limits_cpp_int ] [ run test_numeric_limits.cpp mpfi mpfr gmp no_eh_support : # command line : # input files : # requirements - TEST_MPFI_50 + TEST_MPFI_50 [ check-target-builds ../config//has_mpfi : : no ] : test_numeric_limits_mpfi_50 ] @@ -327,14 +327,14 @@ test-suite functions_and_limits : : # command line : # input files : # requirements - TEST_FLOAT128 + TEST_FLOAT128 [ check-target-builds ../config//has_float128 : : no ] : test_numeric_limits_float128 ] [ run test_numeric_limits.cpp no_eh_support : # command line : # input files : # requirements - TEST_FLOAT128 + TEST_FLOAT128 [ check-target-builds ../config//has_intel_quad : -Qoption,cpp,--extended_float_type : no ] [ check-target-builds ../config//has_float128 : quadmath ] : test_numeric_limits_intel_quad ] @@ -351,7 +351,7 @@ test-suite functions_and_limits : : # command line : # input files : # requirements - TEST_MPFR + TEST_MPFR [ check-target-builds ../config//has_mpfr : : no ] : test_move_mpfr ] @@ -359,7 +359,7 @@ test-suite functions_and_limits : : # command line : # input files : # requirements - TEST_MPC + TEST_MPC [ check-target-builds ../config//has_mpc : : no ] : test_move_mpc ] @@ -367,7 +367,7 @@ test-suite functions_and_limits : : # command line : # input files : # requirements - TEST_GMP + TEST_GMP [ check-target-builds ../config//has_gmp : : no ] : test_move_gmp ] @@ -375,7 +375,7 @@ test-suite functions_and_limits : : # command line : # input files : # requirements - TEST_TOMMATH + TEST_TOMMATH [ check-target-builds ../config//has_tommath : : no ] : test_move_tommath ] @@ -383,7 +383,7 @@ test-suite functions_and_limits : : # command line : # input files : # requirements - TEST_CPP_INT + TEST_CPP_INT : test_move_cpp_int ] [ get_function_tests ] @@ -413,7 +413,7 @@ test-suite conversions : : # command line : # input files : # requirements - TEST_MPF_50 + TEST_MPF_50 [ check-target-builds ../config//has_gmp : : no ] : test_constants_mpf50 ] @@ -421,7 +421,7 @@ test-suite conversions : : # command line : # input files : # requirements - TEST_MPFR_50 + TEST_MPFR_50 [ check-target-builds ../config//has_mpfr : : no ] : test_constants_mpfr_50 ] @@ -429,7 +429,7 @@ test-suite conversions : : # command line : # input files : # requirements - TEST_CPP_DEC_FLOAT + TEST_CPP_DEC_FLOAT : test_constants_cpp_dec_float ] @@ -443,120 +443,120 @@ test-suite conversions : : # command line : # input files : # requirements - [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] - [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] - [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] - [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] + [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] + [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] + [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] + [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_mpz_int.cpp : # command line : # input files : # requirements - [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] - [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] - [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] - [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] + [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] + [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] + [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] + [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_tom_int.cpp : # command line : # input files : # requirements - [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] - [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] - [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] - [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] + [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] + [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] + [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] + [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_cpp_rational.cpp : # command line : # input files : # requirements - [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] - [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] - [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] - [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] + [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] + [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] + [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] + [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_gmp_rational.cpp : # command line : # input files : # requirements - [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] - [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] - [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] - [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] + [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] + [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] + [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] + [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_tom_rational.cpp : # command line : # input files : # requirements - [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] - [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] - [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] - [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] + [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] + [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] + [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] + [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_cpp_bin_float.cpp : # command line : # input files : # requirements - [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] - [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] - [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] - [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] + [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] + [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] + [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] + [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_cpp_dec_float.cpp : # command line : # input files : # requirements - [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] - [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] - [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] - [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] + [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] + [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] + [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] + [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_mpf_float.cpp : # command line : # input files : # requirements - [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] - [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] - [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] - [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] + [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] + [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] + [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] + [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_mpfr_float.cpp : # command line : # input files : # requirements - [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] - [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] - [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] - [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] + [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] + [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] + [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] + [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_mpfi_float.cpp : # command line : # input files : # requirements - [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] - [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] - [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] - [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] + [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] + [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] + [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] + [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_float128.cpp : # command line : # input files : # requirements - [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] - [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] - [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] - [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] + [ check-target-builds ../config//has_gmp : HAS_GMP gmp : ] + [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] + [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] + [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] @@ -566,7 +566,7 @@ test-suite conversions : : # command line : # input files : # requirements - TEST_CPP_BIN_FLOAT + TEST_CPP_BIN_FLOAT TEST1 release # Otherwise [ runtime is slow : test_cpp_bin_float_io_1 @@ -576,7 +576,7 @@ test-suite conversions : : # command line : # input files : # requirements - TEST_CPP_BIN_FLOAT + TEST_CPP_BIN_FLOAT TEST2 release # Otherwise [ runtime is slow : test_cpp_bin_float_io_2 @@ -586,7 +586,7 @@ test-suite conversions : : # command line : # input files : # requirements - TEST_MPFR + TEST_MPFR [ check-target-builds ../config//has_mpfr : : no ] release # Otherwise [ runtime is slow ] @@ -595,7 +595,7 @@ test-suite conversions : : # command line : # input files : # requirements - TEST_CPP_DEC_FLOAT + TEST_CPP_DEC_FLOAT release # Otherwise [ runtime is slow : test_float_io_cpp_dec_float ] @@ -603,7 +603,7 @@ test-suite conversions : : # command line : # input files : # requirements - TEST_MPF_50 + TEST_MPF_50 release # Otherwise [ runtime is slow [ check-target-builds ../config//has_gmp : : no ] : test_float_io_mpf ] @@ -612,7 +612,7 @@ test-suite conversions : : # command line : # input files : # requirements - TEST_MPFR_50 + TEST_MPFR_50 release # Otherwise [ runtime is slow [ check-target-builds ../config//has_mpfr : : no ] : test_float_io_mpfr ] @@ -621,7 +621,7 @@ test-suite conversions : : # command line : # input files : # requirements - TEST_MPFI_50 + TEST_MPFI_50 release # Otherwise [ runtime is slow [ check-target-builds ../config//has_mpfi : : no ] : test_float_io_mpfi ] @@ -630,7 +630,7 @@ test-suite conversions : : # command line : # input files : # requirements - TEST_FLOAT128 + TEST_FLOAT128 release # Otherwise [ runtime is slow [ check-target-builds ../config//has_float128 : : no ] : test_float_io_float128 ] @@ -638,7 +638,7 @@ test-suite conversions : : # command line : # input files : # requirements - TEST_FLOAT128 + TEST_FLOAT128 release # Otherwise [ runtime is slow [ check-target-builds ../config//has_intel_quad : -Qoption,cpp,--extended_float_type : no ] [ check-target-builds ../config//has_float128 : quadmath ] : test_float_io_intel_quad ] @@ -647,7 +647,7 @@ test-suite conversions : : # command line : # input files : # requirements - TEST_TOMMATH + TEST_TOMMATH release # Otherwise [ runtime is slow [ check-target-builds ../config//has_tommath : : no ] : test_int_io_tommath ] @@ -656,7 +656,7 @@ test-suite conversions : : # command line : # input files : # requirements - TEST_MPZ + TEST_MPZ release # Otherwise [ runtime is slow [ check-target-builds ../config//has_gmp : : no ] : test_int_io_mpz ] @@ -670,7 +670,7 @@ test-suite cpp_int_tests : : # command line : # input files : # requirements - TEST_CPP_INT + TEST_CPP_INT release # Otherwise [ runtime is slow : test_int_io_cpp_int ] @@ -739,7 +739,7 @@ test-suite cpp_int_tests : [ run test_cpp_int_serial.cpp ../../serialization/build//boost_serialization : : : release TEST2 gcc-mingw:static : test_cpp_int_serial_2 ] [ run test_cpp_int_serial.cpp ../../serialization/build//boost_serialization : : : release TEST3 gcc-mingw:static : test_cpp_int_serial_3 ] [ run test_cpp_int_serial.cpp ../../serialization/build//boost_serialization : : : release TEST4 gcc-mingw:static : test_cpp_int_serial_4 ] - [ run test_cpp_int_deserial.cpp ../../serialization/build//boost_serialization ../../filesystem/build//boost_filesystem : $(here) : : release gcc-mingw:static ] + [ run test_cpp_int_deserial.cpp ../../serialization/build//boost_serialization ../../filesystem/build//boost_filesystem : $(here)/serial_txts : : release gcc-mingw:static ] [ run test_cpp_rat_serial.cpp ../../serialization/build//boost_serialization : : : release gcc-mingw:static ] ; @@ -771,7 +771,7 @@ test-suite misc : : # command line : # input files : # requirements - TEST_TOMMATH + TEST_TOMMATH [ check-target-builds ../config//has_tommath : : no ] release # Otherwise [ runtime is slow : test_rational_io_tommath ] @@ -780,7 +780,7 @@ test-suite misc : : # command line : # input files : # requirements - TEST_MPQ + TEST_MPQ [ check-target-builds ../config//has_gmp : : no ] release # Otherwise [ runtime is slow : test_rational_io_mpz ] @@ -789,7 +789,7 @@ test-suite misc : : # command line : # input files : # requirements - TEST_CPP_INT + TEST_CPP_INT release # Otherwise [ runtime is slow : test_rational_io_cpp_int ] @@ -1129,7 +1129,7 @@ rule get_concept_checks result += [ compile $(source) mpfr : # requirements - TEST_MPFR_50 + TEST_MPFR_50 [ check-target-builds ../config//has_mpfr : : no ] off space @@ -1137,7 +1137,7 @@ rule get_concept_checks result += [ compile $(source) mpfr : # requirements - TEST_MPFR_6 + TEST_MPFR_6 [ check-target-builds ../config//has_mpfr : : no ] off space @@ -1145,7 +1145,7 @@ rule get_concept_checks result += [ compile $(source) mpfr : # requirements - TEST_MPFR_15 + TEST_MPFR_15 [ check-target-builds ../config//has_mpfr : : no ] off space @@ -1153,7 +1153,7 @@ rule get_concept_checks result += [ compile $(source) mpfr : # requirements - TEST_MPFR_17 + TEST_MPFR_17 [ check-target-builds ../config//has_mpfr : : no ] off space @@ -1161,7 +1161,7 @@ rule get_concept_checks result += [ compile $(source) mpfr : # requirements - TEST_MPFR_30 + TEST_MPFR_30 [ check-target-builds ../config//has_mpfr : : no ] off space @@ -1169,7 +1169,7 @@ rule get_concept_checks result += [ compile $(source) gmp : # requirements - TEST_MPF_50 + TEST_MPF_50 [ check-target-builds ../config//has_gmp : : no ] off space @@ -1177,35 +1177,35 @@ rule get_concept_checks result += [ compile $(source) : # requirements - TEST_CPP_DEC_FLOAT + TEST_CPP_DEC_FLOAT off space : $(source:B)_cpp_dec_float ] ; result += [ compile $(source) : # requirements - TEST_CPP_BIN_FLOAT + TEST_CPP_BIN_FLOAT off space : $(source:B)_cpp_bin_float ] ; result += [ compile $(source) : # requirements - TEST_CPP_DEC_FLOAT_NO_ET + TEST_CPP_DEC_FLOAT_NO_ET off space : $(source:B)_cpp_dec_float_no_et ] ; result += [ compile $(source) : # requirements - TEST_BACKEND + TEST_BACKEND off space : $(source:B)_backend_concept ] ; result += [ compile $(source) : # requirements - TEST_LOGGED_ADAPTER + TEST_LOGGED_ADAPTER off space : $(source:B)_logged_adaptor ] ; diff --git a/test/test_cpp_int_deserial.cpp b/test/test_cpp_int_deserial.cpp index 82155d60..c0a3955b 100644 --- a/test/test_cpp_int_deserial.cpp +++ b/test/test_cpp_int_deserial.cpp @@ -25,7 +25,7 @@ #include #include -boost::filesystem::path root("./serial_txts"); +boost::filesystem::path root; template void test64()