Merge branch 'develop' into feature/constexpr

This commit is contained in:
Peter Dimov
2018-01-22 08:07:54 +02:00
2 changed files with 12 additions and 8 deletions

View File

@ -8,6 +8,7 @@
# See library home page at http://www.boost.org/libs/system # See library home page at http://www.boost.org/libs/system
import testing ; import testing ;
import os ;
project project
: requirements : requirements
@ -75,6 +76,16 @@ project
return $(result) ; return $(result) ;
} }
if [ os.environ UBSAN ]
{
rule system-run ( sources + )
{
# The 03/11 tests are ODR violations, no point running them under -fsanitize=undefined
return [ system-run- $(sources) ] ;
}
}
else
{
rule system-run ( sources + ) rule system-run ( sources + )
{ {
local result = [ system-run- $(sources) ] ; local result = [ system-run- $(sources) ] ;
@ -89,6 +100,7 @@ project
return $(result) ; return $(result) ;
} }
}
test-suite "system" test-suite "system"
: [ system-run error_code_test.cpp ] : [ system-run error_code_test.cpp ]

View File

@ -12,13 +12,10 @@
# define _CRT_SECURE_NO_WARNINGS # define _CRT_SECURE_NO_WARNINGS
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/config/pragma_message.hpp>
#include <iostream> #include <iostream>
#if defined(BOOST_NO_CXX11_HDR_SYSTEM_ERROR) #if defined(BOOST_NO_CXX11_HDR_SYSTEM_ERROR)
BOOST_PRAGMA_MESSAGE("Skipping test, BOOST_NO_CXX11_HDR_SYSTEM_ERROR is defined")
int main() int main()
{ {
std::cout std::cout
@ -26,11 +23,6 @@ int main()
" support header <system_error> so interoperation will not be tested.\n"; " support header <system_error> so interoperation will not be tested.\n";
} }
#elif defined(UBSAN)
BOOST_PRAGMA_MESSAGE("Skipping test, UBSAN is defined")
int main() {}
#else #else
#include <boost/system/error_code.hpp> #include <boost/system/error_code.hpp>