diff --git a/test/Jamfile b/test/Jamfile index 0fbabce1..d93668c0 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -15,8 +15,6 @@ import ../../config/checks/config : requires ; if [ os.environ CI ] { CI_DEFINES = CI_SKIP_KNOWN_FAILURE=1 ; - CI_DEFINES += RUNNING_ON_TRAVIS=1 ; # for backward compatibility - CI_DEFINES += RUNNING_ON_APPVEYOR=1 ; # for backward compatibility } project diff --git a/test/sequence/define_struct_inline_move.cpp b/test/sequence/define_struct_inline_move.cpp index 6cf2d053..1650fae6 100644 --- a/test/sequence/define_struct_inline_move.cpp +++ b/test/sequence/define_struct_inline_move.cpp @@ -1,5 +1,5 @@ /*============================================================================= - Copyright (c) 2016 Kohei Takahashi + Copyright (c) 2016-2018 Kohei Takahashi Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -52,7 +52,7 @@ int main() } // Older MSVCs don't generate move ctor by default. -#if !(defined(RUNNING_ON_APPVEYOR) && BOOST_WORKAROUND(BOOST_MSVC, < 1900)) +#if !(defined(CI_SKIP_KNOWN_FAILURE) && BOOST_WORKAROUND(BOOST_MSVC, < 1900)) { ns::value x; ns::value y(std::move(x)); // move @@ -70,7 +70,7 @@ int main() BOOST_TEST(x.w.value == 0); BOOST_TEST(y.w.value == 0); } -#endif // !(appveyor && msvc < 14.0) +#endif // !(ci && msvc < 14.0) return boost::report_errors(); } diff --git a/test/sequence/define_tpl_struct_inline_move.cpp b/test/sequence/define_tpl_struct_inline_move.cpp index 27be0573..3843ca16 100644 --- a/test/sequence/define_tpl_struct_inline_move.cpp +++ b/test/sequence/define_tpl_struct_inline_move.cpp @@ -1,5 +1,5 @@ /*============================================================================= - Copyright (c) 2016 Kohei Takahashi + Copyright (c) 2016-2018 Kohei Takahashi Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -52,7 +52,7 @@ int main() } // Older MSVCs don't generate move ctor by default. -#if !(defined(RUNNING_ON_APPVEYOR) && BOOST_WORKAROUND(BOOST_MSVC, < 1900)) +#if !(defined(CI_SKIP_KNOWN_FAILURE) && BOOST_WORKAROUND(BOOST_MSVC, < 1900)) { ns::value x; ns::value y(std::move(x)); // move @@ -70,7 +70,7 @@ int main() BOOST_TEST(x.w.value == 0); BOOST_TEST(y.w.value == 0); } -#endif // !(appveyor && msvc < 14.0) +#endif // !(ci && msvc < 14.0) return boost::report_errors(); }