Use new common CI marker

This commit is contained in:
Kohei Takahashi
2018-01-29 10:34:33 +09:00
parent dfceaffc58
commit 671f22b013
3 changed files with 6 additions and 8 deletions

View File

@ -15,8 +15,6 @@ import ../../config/checks/config : requires ;
if [ os.environ CI ] if [ os.environ CI ]
{ {
CI_DEFINES = <define>CI_SKIP_KNOWN_FAILURE=1 ; CI_DEFINES = <define>CI_SKIP_KNOWN_FAILURE=1 ;
CI_DEFINES += <define>RUNNING_ON_TRAVIS=1 ; # for backward compatibility
CI_DEFINES += <define>RUNNING_ON_APPVEYOR=1 ; # for backward compatibility
} }
project project

View File

@ -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 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) 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. // 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 x;
ns::value y(std::move(x)); // move ns::value y(std::move(x)); // move
@ -70,7 +70,7 @@ int main()
BOOST_TEST(x.w.value == 0); BOOST_TEST(x.w.value == 0);
BOOST_TEST(y.w.value == 0); BOOST_TEST(y.w.value == 0);
} }
#endif // !(appveyor && msvc < 14.0) #endif // !(ci && msvc < 14.0)
return boost::report_errors(); return boost::report_errors();
} }

View File

@ -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 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) 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. // 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<wrapper> x; ns::value<wrapper> x;
ns::value<wrapper> y(std::move(x)); // move ns::value<wrapper> y(std::move(x)); // move
@ -70,7 +70,7 @@ int main()
BOOST_TEST(x.w.value == 0); BOOST_TEST(x.w.value == 0);
BOOST_TEST(y.w.value == 0); BOOST_TEST(y.w.value == 0);
} }
#endif // !(appveyor && msvc < 14.0) #endif // !(ci && msvc < 14.0)
return boost::report_errors(); return boost::report_errors();
} }