Merge branch 'develop' into feature/constexpr

test/initialization_test.cpp

@@ -10,19 +10,19 @@
 //  This test verifiies that the error_category vtable does not suffer from
 //  order-of-initialization problems.
 
-#include <boost/detail/lightweight_test.hpp>
 #include <boost/system/error_code.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 struct foo
 {
   foo()
   {
     boost::system::error_code ec;
-    ec == boost::system::errc::permission_denied;
+    BOOST_TEST_NE( ec, boost::system::errc::permission_denied );
   }
 } f;
 
-int main( int, char ** )
+int main()
 {
-  return ::boost::report_errors();
+  return boost::report_errors();
 }

test/std_mismatch_test.cpp

@@ -12,10 +12,13 @@
 # define _CRT_SECURE_NO_WARNINGS
 
 #include <boost/config.hpp>
+#include <boost/config/pragma_message.hpp>
 #include <iostream>
 
 #if defined(BOOST_NO_CXX11_HDR_SYSTEM_ERROR)
 
+BOOST_PRAGMA_MESSAGE("Skipping test, BOOST_NO_CXX11_HDR_SYSTEM_ERROR is defined")
+
 int main()
 {
   std::cout
@@ -23,6 +26,11 @@ int main()
     " 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
 
 #include <boost/system/error_code.hpp>