From aa2158f97b309d656533a5087d67559b0afaa2a2 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 16 Jul 2017 02:29:40 +0300 Subject: [PATCH] Define CI_SUPPRESS_KNOWN_ISSUES on Travis, suppress known g++-4 issues --- .travis.yml | 2 +- test/is_list_constructible_test.cpp | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f469d33..0764781 100644 --- a/.travis.yml +++ b/.travis.yml @@ -584,7 +584,7 @@ script: - |- echo "using $TOOLSET : : $COMPILER : -std=$CXXSTD ;" > ~/user-config.jam - (cd libs/config/test && ../../../b2 config_info_travis_install toolset=$TOOLSET && ./config_info_travis) - - ./b2 -j3 libs/type_traits/test toolset=$TOOLSET + - ./b2 -j3 libs/type_traits/test toolset=$TOOLSET define=CI_SUPPRESS_KNOWN_ISSUES notifications: email: diff --git a/test/is_list_constructible_test.cpp b/test/is_list_constructible_test.cpp index 455da09..bbf1d59 100644 --- a/test/is_list_constructible_test.cpp +++ b/test/is_list_constructible_test.cpp @@ -55,7 +55,12 @@ BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), tr BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), true); BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), false); BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), true); + +#if defined(CI_SUPPRESS_KNOWN_ISSUES) && defined(__GNUC__) && (__GNUC__ == 4) +// g++ 4.x doesn't seem to disallow narrowing +#else BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), false); +#endif BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), true); BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), true); @@ -63,8 +68,13 @@ BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value) BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), true); BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), true); BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), false); + +#if defined(CI_SUPPRESS_KNOWN_ISSUES) && defined(__GNUC__) && (__GNUC__ == 4) +// g++ 4.x doesn't seem to disallow narrowing +#else BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), false); BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), false); +#endif BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), true); BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), true); @@ -73,7 +83,9 @@ BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), true); BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), false); -#if defined(CI_SUPPRESS_KNOWN_ISSUES) && defined(__GNUC__) && (__GNUC__ == 7) && (__cplusplus >= 201500) +#if defined(CI_SUPPRESS_KNOWN_ISSUES) && defined(__GNUC__) && (__GNUC__ == 4) +// g++ 4.x doesn't seem to disallow narrowing +#elif defined(CI_SUPPRESS_KNOWN_ISSUES) && defined(__GNUC__) && (__GNUC__ == 7) && (__cplusplus >= 201500) // g++ 7.1 in -std=c++1z, c++17 has a bug #else BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), false); @@ -87,8 +99,10 @@ BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), true); BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), false); -#if defined(CI_SUPPRESS_KNOWN_ISSUES) && defined(__GNUC__) && (__GNUC__ == 7) && (__cplusplus >= 201500) -// -"- +#if defined(CI_SUPPRESS_KNOWN_ISSUES) && defined(__GNUC__) && (__GNUC__ == 4) +// g++ 4.x doesn't seem to disallow narrowing +#elif defined(CI_SUPPRESS_KNOWN_ISSUES) && defined(__GNUC__) && (__GNUC__ == 7) && (__cplusplus >= 201500) +// g++ 7.1 in -std=c++1z, c++17 has a bug #else BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), false); BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_list_constructible::value), false);