From dd402577ccefb85a626bcb77efe93879b074dc9a Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Tue, 23 May 2017 18:08:26 +0100 Subject: [PATCH] Travis: enable more tests, move some tests between aliases as some OSX tests still time out. --- .travis.yml | 71 ++++++ test/Jamfile.v2 | 609 ++++++++++++++++++++++++------------------------ 2 files changed, 379 insertions(+), 301 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc37c49e..28385d86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -236,6 +236,50 @@ matrix: sources: - ubuntu-toolchain-r-test + - os: linux + env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03 TEST_SUITE=compile_fail + addons: + apt: + packages: + - g++-6 + - libgmp-dev + - libmpfr-dev + sources: + - ubuntu-toolchain-r-test + + - os: linux + env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 TEST_SUITE=compile_fail + addons: + apt: + packages: + - g++-6 + - libgmp-dev + - libmpfr-dev + sources: + - ubuntu-toolchain-r-test + + - os: linux + env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 TEST_SUITE=compile_fail + addons: + apt: + packages: + - g++-6 + - libgmp-dev + - libmpfr-dev + sources: + - ubuntu-toolchain-r-test + + - os: linux + env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z TEST_SUITE=compile_fail + addons: + apt: + packages: + - g++-6 + - libgmp-dev + - libmpfr-dev + sources: + - ubuntu-toolchain-r-test + - os: linux env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE=arithmetic_tests addons: @@ -280,6 +324,17 @@ matrix: sources: - ubuntu-toolchain-r-test + - os: linux + env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14 TEST_SUITE=compile_fail + addons: + apt: + packages: + - g++-5 + - libgmp-dev + - libmpfr-dev + sources: + - ubuntu-toolchain-r-test + - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=arithmetic_tests osx_image: xcode8.1 @@ -296,6 +351,10 @@ matrix: env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=misc osx_image: xcode8.1 + - os: osx + env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=compile_fail + osx_image: xcode8.1 + - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=arithmetic_tests osx_image: xcode8.3 @@ -312,6 +371,10 @@ matrix: env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=misc osx_image: xcode8.3 + - os: osx + env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=compile_fail + osx_image: xcode8.3 + - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=arithmetic_tests osx_image: xcode7.3 @@ -328,6 +391,10 @@ matrix: env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=misc osx_image: xcode7.3 + - os: osx + env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=compile_fail + osx_image: xcode7.3 + - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=arithmetic_tests osx_image: xcode6.4 @@ -344,6 +411,10 @@ matrix: env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=misc osx_image: xcode6.4 + - os: osx + env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14 TEST_SUITE=compile_fail + osx_image: xcode6.4 + install: - cd .. - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index fb667a89..cee5e783 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -125,58 +125,6 @@ run test_arithmetic_mpfi_50.cpp mpfi mpfr gmp no_eh_support : : : [ check-target run test_arithmetic_float_128.cpp quadmath no_eh_support : : : [ check-target-builds ../config//has_float128 : : no ] ; run test_arithmetic_float_128.cpp no_eh_support : : : [ check-target-builds ../config//has_intel_quad : -Qoption,cpp,--extended_float_type : no ] [ check-target-builds ../config//has_float128 : quadmath ] : test_arithmetic_intel_quad ; -alias arithmetic_tests : - test_arithmetic_backend_concept - test_arithmetic_cpp_dec_float_1 - test_arithmetic_cpp_dec_float_2 - test_arithmetic_cpp_dec_float_3 - test_arithmetic_cpp_bin_float_1 - test_arithmetic_cpp_bin_float_2 - test_arithmetic_cpp_bin_float_3 - test_arithmetic_mpf_50 - test_arithmetic_mpf - test_arithmetic_mpz - test_arithmetic_mpz_rat - test_arithmetic_mpz_br - test_arithmetic_mpq - test_arithmetic_mpfr - test_arithmetic_mpfr_50 - test_arithmetic_mpfr_50_static - test_arithmetic_tommath - test_arithmetic_tommath_rat - test_arithmetic_tommath_br - test_arithmetic_cpp_int_1 - test_arithmetic_cpp_int_2 - test_arithmetic_cpp_int_3 - test_arithmetic_cpp_int_4 - test_arithmetic_cpp_int_5 - test_arithmetic_cpp_int_6 - test_arithmetic_cpp_int_7 - test_arithmetic_cpp_int_8 - test_arithmetic_cpp_int_9 - test_arithmetic_cpp_int_10 - test_arithmetic_cpp_int_11 - test_arithmetic_cpp_int_12 - test_arithmetic_cpp_int_13 - test_arithmetic_cpp_int_14 - test_arithmetic_cpp_int_15 - test_arithmetic_cpp_int_16 - test_arithmetic_cpp_int_17 - test_arithmetic_cpp_int_18 - test_arithmetic_cpp_int_br - test_arithmetic_ab_1 - test_arithmetic_ab_2 - test_arithmetic_ab_3 - test_cpp_dec_float_round - test_arithmetic_logged_1 - test_arithmetic_logged_2 - test_arithmetic_dbg_adptr1 - test_arithmetic_dbg_adptr2 - test_arithmetic_mpfi_50 - test_arithmetic_float_128 - test_arithmetic_float_128 ; - - run test_numeric_limits.cpp no_eh_support : # command line : # input files @@ -336,141 +284,6 @@ for local source in test_exp.cpp test_log.cpp test_pow.cpp test_sinh.cpp test_sq : $(source:B)_intel_quad ; } -alias functions_and_limits : - test_numeric_limits_backend_concept - test_numeric_limits_mpf50 - test_numeric_limits_mpf - test_numeric_limits_mpz - test_numeric_limits_mpq - test_numeric_limits_mpfr - test_numeric_limits_mpfr_50 - test_numeric_limits_cpp_dec_float - test_numeric_limits_cpp_bin_float - test_numeric_limits_tommath - test_numeric_limits_cpp_int - test_numeric_limits_mpfi_50 - test_numeric_limits_float128 - - test_exp_mpf50 - test_log_mpf50 - test_pow_mpf50 - test_sinh_mpf50 - test_sqrt_mpf50 - test_cosh_mpf50 - test_tanh_mpf50 - test_sin_mpf50 - test_cos_mpf50 - test_tan_mpf50 - test_asin_mpf50 - test_acos_mpf50 - test_atan_mpf50 - test_round_mpf50 - test_fpclassify_mpf50 - test_sf_import_c99_mpf50 - - test_exp_mpfr50 - test_log_mpfr50 - test_pow_mpfr50 - test_sinh_mpfr50 - test_sqrt_mpfr50 - test_cosh_mpfr50 - test_tanh_mpfr50 - test_sin_mpfr50 - test_cos_mpfr50 - test_tan_mpfr50 - test_asin_mpfr50 - test_acos_mpfr50 - test_atan_mpfr50 - test_round_mpfr50 - test_fpclassify_mpfr50 - test_sf_import_c99_mpfr50 - - test_exp_mpfi50 - test_log_mpfi50 - test_pow_mpfi50 - test_sinh_mpfi50 - test_sqrt_mpfi50 - test_cosh_mpfi50 - test_tanh_mpfi50 - test_sin_mpfi50 - test_cos_mpfi50 - test_tan_mpfi50 - test_asin_mpfi50 - test_acos_mpfi50 - test_atan_mpfi50 - test_round_mpfi50 - test_fpclassify_mpfi50 - test_sf_import_c99_mpfi50 - - test_exp_cpp_dec_float - test_log_cpp_dec_float - test_pow_cpp_dec_float - test_sinh_cpp_dec_float - test_sqrt_cpp_dec_float - test_cosh_cpp_dec_float - test_tanh_cpp_dec_float - test_sin_cpp_dec_float - test_cos_cpp_dec_float - test_tan_cpp_dec_float - test_asin_cpp_dec_float - test_acos_cpp_dec_float - test_atan_cpp_dec_float - test_round_cpp_dec_float - test_fpclassify_cpp_dec_float - test_sf_import_c99_cpp_dec_float - - test_exp_cpp_bin_float - test_log_cpp_bin_float - test_pow_cpp_bin_float - test_sinh_cpp_bin_float - test_sqrt_cpp_bin_float - test_cosh_cpp_bin_float - test_tanh_cpp_bin_float - test_sin_cpp_bin_float - test_cos_cpp_bin_float - test_tan_cpp_bin_float - test_asin_cpp_bin_float - test_acos_cpp_bin_float - test_atan_cpp_bin_float - test_round_cpp_bin_float - test_fpclassify_cpp_bin_float - test_sf_import_c99_cpp_bin_float - - test_exp_float128 - test_log_float128 - test_pow_float128 - test_sinh_float128 - test_sqrt_float128 - test_cosh_float128 - test_tanh_float128 - test_sin_float128 - test_cos_float128 - test_tan_float128 - test_asin_float128 - test_acos_float128 - test_atan_float128 - test_round_float128 - test_fpclassify_float128 - test_sf_import_c99_float128 - - test_exp_intel_quad - test_log_intel_quad - test_pow_intel_quad - test_sinh_intel_quad - test_sqrt_intel_quad - test_cosh_intel_quad - test_tanh_intel_quad - test_sin_intel_quad - test_cos_intel_quad - test_tan_intel_quad - test_asin_intel_quad - test_acos_intel_quad - test_atan_intel_quad - test_round_intel_quad - test_fpclassify_intel_quad - test_sf_import_c99_intel_quad -; - run test_gmp_conversions.cpp gmp no_eh_support : # command line : # input files @@ -981,71 +794,6 @@ run test_mixed_float.cpp no_eh_support [ check-target-builds ../config//has_gmp : TEST_GMP gmp : ] [ check-target-builds ../config//has_mpfr : TEST_MPFR mpfr gmp : ] ; -alias conversions : - test_gmp_conversions - test_mpfr_conversions - test_constants_mpf50 - test_constants_mpfr_50 - test_constants_cpp_dec_float - test_move_gmp - test_move_mpfr - test_move_tommath - test_move_cpp_int - test_test - test_cpp_int_lit - test_convert_from_cpp_int - test_convert_from_mpz_int - test_convert_from_tom_int - test_convert_from_cpp_rational - test_convert_from_gmp_rational - test_convert_from_tom_rational - test_convert_from_cpp_bin_float - test_convert_from_cpp_dec_float - test_convert_from_mpf_float - test_convert_from_mpfr_float - test_convert_from_mpfi_float - test_convert_from_float128 - test_cpp_bin_float_io_1 - test_cpp_bin_float_io_2 - test_cpp_bin_float - test_float_io_cpp_dec_float - test_float_io_mpf - test_float_io_mpfr - test_float_io_mpfi - test_float_io_float128 - test_float_io_intel_quad - test_int_io_tommath - test_int_io_mpz - test_int_io_cpp_int - test_cpp_int_left_shift - test_cpp_int_1 - test_cpp_int_2 - test_cpp_int_3 - test_cpp_int_4 - test_cpp_int_5 - test_checked_cpp_int - test_unchecked_cpp_int - test_miller_rabin - test_rational_io_tommath - test_rational_io_mpz - test_rational_io_cpp_int - test_generic_conv - test_rat_float_interconv_1 - test_rat_float_interconv_2 - test_rat_float_interconv_3 - test_rat_float_interconv_4 - test_rat_float_interconv_5 - test_rat_float_interconv_6 - test_rat_float_interconv_7 - test_rat_float_interconv_8 - test_cpp_int_conv - test_cpp_int_import_export - test_native_integer - test_mixed_cpp_int - test_mixed_float -; - - compile include_test/mpfr_include_test.cpp : # requirements [ check-target-builds ../config//has_mpfr : : no ] ; @@ -1117,54 +865,6 @@ run test_hash.cpp : : : [ check-target-builds ../config//has_tommath : TEST_TOMMATH tommath : ] ; -alias misc : - test_constexpr - test_nothrow_cpp_int - test_nothrow_cpp_rational - test_nothrow_cpp_bin_float - test_nothrow_cpp_dec_float - test_nothrow_float128 - test_nothrow_gmp - test_nothrow_mpfr - mpfr_include_test - gmp_include_test - tommath_include_test - cpp_int_include_test - cpp_dec_float_include_test - cpp_bin_float_include_test - test1 - test2 - test4 - test5 - test6 - ublas1_et - ublas2_et - ublas3_et - ublas4_et - ublas5_et - test_cpp_int_serial_1 - test_cpp_int_serial_2 - test_cpp_int_serial_3 - test_cpp_int_serial_4 - test_cpp_int_deserial - test_cpp_rat_serial - test_adapt_serial - test_cpp_dec_float_serial_1 - test_cpp_dec_float_serial_2 - test_float128_serial - test_bin_dec_float_serial_1 - test_bin_dec_float_serial_2 - test_checked_mixed_cpp_int - test_mixed_cpp_bin_float - test_mixed_cpp_dec_float - test_mixed_mpf_float - test_mixed_mpfr_float - test_float_conversions - bug11922 - bug12039 - test_hash -; - if $(enable-specfun) { @@ -1285,10 +985,11 @@ if $(enable-specfun) } } -alias compile_fail ; +local compile_fail_tests ; for local source in [ glob compile_fail/*.cpp ] { + compile_fail_tests += $(source:B) ; compile-fail $(source) : [ check-target-builds ../config//has_gmp : TEST_GMP off : ] @@ -1296,6 +997,8 @@ for local source in [ glob compile_fail/*.cpp ] ; } +alias compile_fail : $(compile_fail_tests) ; + if ! $(disable-concepts) { @@ -1376,6 +1079,310 @@ if ! $(disable-concepts) } } +alias arithmetic_tests : + test_arithmetic_backend_concept + test_arithmetic_cpp_dec_float_1 + test_arithmetic_cpp_dec_float_2 + test_arithmetic_cpp_dec_float_3 + test_arithmetic_cpp_bin_float_1 + test_arithmetic_cpp_bin_float_2 + test_arithmetic_cpp_bin_float_3 + test_arithmetic_mpf_50 + test_arithmetic_mpf + test_arithmetic_mpz + test_arithmetic_mpz_rat + test_arithmetic_mpz_br + test_arithmetic_mpq + test_arithmetic_mpfr + test_arithmetic_mpfr_50 + test_arithmetic_mpfr_50_static + test_arithmetic_tommath + test_arithmetic_tommath_rat + test_arithmetic_tommath_br + test_arithmetic_cpp_int_1 + test_arithmetic_cpp_int_2 + test_arithmetic_cpp_int_3 + test_arithmetic_cpp_int_4 + test_arithmetic_cpp_int_5 + test_arithmetic_cpp_int_6 + test_arithmetic_cpp_int_7 + test_arithmetic_cpp_int_8 + test_arithmetic_cpp_int_9 + test_arithmetic_cpp_int_10 + test_arithmetic_cpp_int_11 + test_arithmetic_cpp_int_12 + test_arithmetic_cpp_int_13 + test_arithmetic_cpp_int_14 + test_arithmetic_cpp_int_15 + test_arithmetic_cpp_int_16 + test_arithmetic_cpp_int_17 + test_arithmetic_cpp_int_18 + test_arithmetic_cpp_int_br + test_arithmetic_ab_1 + test_arithmetic_ab_2 + test_arithmetic_ab_3 + test_cpp_dec_float_round + test_arithmetic_logged_1 + test_arithmetic_logged_2 + test_arithmetic_dbg_adptr1 + test_arithmetic_dbg_adptr2 + test_arithmetic_mpfi_50 + test_arithmetic_float_128 + test_arithmetic_float_128 + + test_cpp_int_left_shift + test_cpp_int_1 + test_cpp_int_2 + test_cpp_int_3 + test_cpp_int_4 + test_cpp_int_5 + test_checked_cpp_int + test_unchecked_cpp_int + ; + + alias functions_and_limits : + test_numeric_limits_backend_concept + test_numeric_limits_mpf50 + test_numeric_limits_mpf + test_numeric_limits_mpz + test_numeric_limits_mpq + test_numeric_limits_mpfr + test_numeric_limits_mpfr_50 + test_numeric_limits_cpp_dec_float + test_numeric_limits_cpp_bin_float + test_numeric_limits_tommath + test_numeric_limits_cpp_int + test_numeric_limits_mpfi_50 + test_numeric_limits_float128 + + test_exp_mpf50 + test_log_mpf50 + test_pow_mpf50 + test_sinh_mpf50 + test_sqrt_mpf50 + test_cosh_mpf50 + test_tanh_mpf50 + test_sin_mpf50 + test_cos_mpf50 + test_tan_mpf50 + test_asin_mpf50 + test_acos_mpf50 + test_atan_mpf50 + test_round_mpf50 + test_fpclassify_mpf50 + test_sf_import_c99_mpf50 + + test_exp_mpfr50 + test_log_mpfr50 + test_pow_mpfr50 + test_sinh_mpfr50 + test_sqrt_mpfr50 + test_cosh_mpfr50 + test_tanh_mpfr50 + test_sin_mpfr50 + test_cos_mpfr50 + test_tan_mpfr50 + test_asin_mpfr50 + test_acos_mpfr50 + test_atan_mpfr50 + test_round_mpfr50 + test_fpclassify_mpfr50 + test_sf_import_c99_mpfr50 + + test_exp_mpfi50 + test_log_mpfi50 + test_pow_mpfi50 + test_sinh_mpfi50 + test_sqrt_mpfi50 + test_cosh_mpfi50 + test_tanh_mpfi50 + test_sin_mpfi50 + test_cos_mpfi50 + test_tan_mpfi50 + test_asin_mpfi50 + test_acos_mpfi50 + test_atan_mpfi50 + test_round_mpfi50 + test_fpclassify_mpfi50 + test_sf_import_c99_mpfi50 + + test_exp_cpp_dec_float + test_log_cpp_dec_float + test_pow_cpp_dec_float + test_sinh_cpp_dec_float + test_sqrt_cpp_dec_float + test_cosh_cpp_dec_float + test_tanh_cpp_dec_float + test_sin_cpp_dec_float + test_cos_cpp_dec_float + test_tan_cpp_dec_float + test_asin_cpp_dec_float + test_acos_cpp_dec_float + test_atan_cpp_dec_float + test_round_cpp_dec_float + test_fpclassify_cpp_dec_float + test_sf_import_c99_cpp_dec_float + + test_exp_cpp_bin_float + test_log_cpp_bin_float + test_pow_cpp_bin_float + test_sinh_cpp_bin_float + test_sqrt_cpp_bin_float + test_cosh_cpp_bin_float + test_tanh_cpp_bin_float + test_sin_cpp_bin_float + test_cos_cpp_bin_float + test_tan_cpp_bin_float + test_asin_cpp_bin_float + test_acos_cpp_bin_float + test_atan_cpp_bin_float + test_round_cpp_bin_float + test_fpclassify_cpp_bin_float + test_sf_import_c99_cpp_bin_float + + test_exp_float128 + test_log_float128 + test_pow_float128 + test_sinh_float128 + test_sqrt_float128 + test_cosh_float128 + test_tanh_float128 + test_sin_float128 + test_cos_float128 + test_tan_float128 + test_asin_float128 + test_acos_float128 + test_atan_float128 + test_round_float128 + test_fpclassify_float128 + test_sf_import_c99_float128 + + test_exp_intel_quad + test_log_intel_quad + test_pow_intel_quad + test_sinh_intel_quad + test_sqrt_intel_quad + test_cosh_intel_quad + test_tanh_intel_quad + test_sin_intel_quad + test_cos_intel_quad + test_tan_intel_quad + test_asin_intel_quad + test_acos_intel_quad + test_atan_intel_quad + test_round_intel_quad + test_fpclassify_intel_quad + test_sf_import_c99_intel_quad + test_move_gmp + test_move_mpfr + test_move_tommath + test_move_cpp_int + test_test + test_cpp_int_lit + test_miller_rabin +; + +alias conversions : + test_gmp_conversions + test_mpfr_conversions + test_constants_mpf50 + test_constants_mpfr_50 + test_constants_cpp_dec_float + test_convert_from_cpp_int + test_convert_from_mpz_int + test_convert_from_tom_int + test_convert_from_cpp_rational + test_convert_from_gmp_rational + test_convert_from_tom_rational + test_convert_from_cpp_bin_float + test_convert_from_cpp_dec_float + test_convert_from_mpf_float + test_convert_from_mpfr_float + test_convert_from_mpfi_float + test_convert_from_float128 + test_cpp_bin_float_io_1 + test_cpp_bin_float_io_2 + test_cpp_bin_float + test_float_io_cpp_dec_float + test_float_io_mpf + test_float_io_mpfr + test_float_io_mpfi + test_float_io_float128 + test_float_io_intel_quad + test_int_io_tommath + test_int_io_mpz + test_int_io_cpp_int + test_rational_io_tommath + test_rational_io_mpz + test_rational_io_cpp_int + test_generic_conv + test_rat_float_interconv_1 + test_rat_float_interconv_2 + test_rat_float_interconv_3 + test_rat_float_interconv_4 + test_rat_float_interconv_5 + test_rat_float_interconv_6 + test_rat_float_interconv_7 + test_rat_float_interconv_8 + test_cpp_int_conv + test_cpp_int_import_export + test_native_integer + test_mixed_cpp_int + test_mixed_float +; + +alias misc : + test_constexpr + test_nothrow_cpp_int + test_nothrow_cpp_rational + test_nothrow_cpp_bin_float + test_nothrow_cpp_dec_float + test_nothrow_float128 + test_nothrow_gmp + test_nothrow_mpfr + mpfr_include_test + gmp_include_test + tommath_include_test + cpp_int_include_test + cpp_dec_float_include_test + cpp_bin_float_include_test + test1 + test2 + test4 + test5 + test6 + ublas1_et + ublas2_et + ublas3_et + ublas4_et + ublas5_et + test_cpp_int_serial_1 + test_cpp_int_serial_2 + test_cpp_int_serial_3 + test_cpp_int_serial_4 + test_cpp_int_deserial + test_cpp_rat_serial + test_adapt_serial + test_cpp_dec_float_serial_1 + test_cpp_dec_float_serial_2 + test_float128_serial + test_bin_dec_float_serial_1 + test_bin_dec_float_serial_2 + test_checked_mixed_cpp_int + test_mixed_cpp_bin_float + test_mixed_cpp_dec_float + test_mixed_mpf_float + test_mixed_mpfr_float + test_float_conversions + bug11922 + bug12039 + test_hash +; + + + + +