diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 44016cd0..3653cd59 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -9,11 +9,13 @@ project boost/test : requirements shared:BOOST_TEST_DYN_LINK=1 msvc:on borland:-w-8080 - # Disable Warning about boost::noncopyable not being exported - shared,msvc:-wd4275 + # Disable Warning about boost::noncopyable not being exported + shared,msvc:-wd4275 + msvc:-wd4671 + msvc:-wd4673 + all : usage-requirements BOOST_TEST_NO_AUTO_LINK=1 - shared:BOOST_TEST_DYN_LINK=1 # Disable Warning about boost::noncopyable not being exported shared,msvc:-wd4275 ; @@ -66,12 +68,33 @@ UTF_SOURCES = xml_report_formatter ; -lib boost_prg_exec_monitor : $(PRG_EXEC_MON_SOURCES).cpp ; +lib boost_prg_exec_monitor + : # sources + $(PRG_EXEC_MON_SOURCES).cpp + : # requirements + : # default build + : # usage-requirements + shared:BOOST_TEST_DYN_LINK=1 + ; -lib boost_test_exec_monitor : $(TEST_EXEC_MON_SOURCES).cpp : static ; +lib boost_test_exec_monitor + : # sources + $(TEST_EXEC_MON_SOURCES).cpp + : # requirements + static + : # default build + : # usage-requirements + shared:BOOST_TEST_DYN_LINK=1 + ; -lib boost_unit_test_framework : $(UTF_SOURCES).cpp ; - +lib boost_unit_test_framework + : # sources + $(UTF_SOURCES).cpp + : # requirements + : # default build + : # usage-requirements + shared:BOOST_TEST_DYN_LINK=1 + ; alias minimal : : : : msvc:on @@ -81,8 +104,7 @@ alias included : : : : msvc:on ; - boost-install boost_prg_exec_monitor boost_test_exec_monitor - boost_unit_test_framework ; - \ No newline at end of file + boost_unit_test_framework ; + \ No newline at end of file diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 887d4dfd..24665318 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -22,7 +22,7 @@ rule test-btl-lib ( test-rule : test-name : lib-name ? : pattern_file * : source borland:-w-8080 msvc-6.5:static msvc-8.0:_SCL_SECURE_NO_DEPRECATE - BOOST_TEST_NO_AUTO_LINK=1 # requirements + all : $(test-name) ] ; } @@ -56,7 +56,7 @@ test-suite "basics_test" ; test-suite "prg_exec_monitor_test" - : [ test-btl-lib run-fail : prg_exec_fail1 : boost_prg_exec_monitor/static ] + : [ test-btl-lib run-fail : prg_exec_fail1 : included ] [ test-btl-lib run-fail : prg_exec_fail2 : boost_prg_exec_monitor/static ] [ test-btl-lib run-fail : prg_exec_fail3 : boost_prg_exec_monitor/static ] [ test-btl-lib run-fail : prg_exec_fail4 : boost_prg_exec_monitor/static ] @@ -81,15 +81,15 @@ test-suite "unit_test_framework_test" [ test-btl-lib run : token_iterator_test : boost_unit_test_framework ] [ test-btl-lib run : boost_check_equal_str : boost_unit_test_framework ] [ test-btl-lib run : test_tree_management_test : boost_unit_test_framework ] - ; + ; test-suite "multithreaded_test" : - [ test-btl-lib-mt run : sync_access_test : boost_unit_test_framework/static : : : /boost/thread//boost_thread ] - ; + [ test-btl-lib-mt run : sync_access_test : boost_unit_test_framework/static : : : /boost/thread//boost_thread ] + ; # A target that runs all the tests alias test : basics_test prg_exec_monitor_test unit_test_framework_test ; # Only run tests when explicitly requested -# explicit test basics_test prg_exec_monitor_test unit_test_framework_test ; +# explicit test basics_test prg_exec_monitor_test unit_test_framework_test ; diff --git a/test/basic_cstring_test.cpp b/test/basic_cstring_test.cpp index cbecb8bc..3dd72147 100644 --- a/test/basic_cstring_test.cpp +++ b/test/basic_cstring_test.cpp @@ -14,6 +14,7 @@ #ifdef _MSC_VER #pragma warning(disable: 4996) +#pragma warning(disable: 4267) #endif // Boost.Test diff --git a/test/test_files/test_fp_comparisons.pattern b/test/test_files/test_fp_comparisons.pattern deleted file mode 100644 index 2279139d..00000000 --- a/test/test_files/test_fp_comparisons.pattern +++ /dev/null @@ -1,30 +0,0 @@ -152: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-20} exceeds 1e-05% -153: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-30} exceeds 1e-05% -154: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{-1e-10} exceeds 0.1% -155: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{0.123457} exceeds 0.0001% -159: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{-0.123457} exceeds 0.001% -163: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.23456e-10} and fp2{1.23457e-11} exceeds 0.001% -164: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.111e-10} and fp2{1.112e-10} exceeds 0.08999% -165: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.112e-10} and fp2{1.111e-10} exceeds 0.08999% -170: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1} and fp2{1.0002} exceeds 0.011% -152: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-20} exceeds 1e-05% -153: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-30} exceeds 1e-05% -154: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{-1e-10} exceeds 0.1% -155: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{0.123457} exceeds 0.0001% -159: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{-0.123457} exceeds 0.001% -163: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.23456e-10} and fp2{1.23457e-11} exceeds 0.001% -164: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.111e-10} and fp2{1.112e-10} exceeds 0.08999% -165: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.112e-10} and fp2{1.111e-10} exceeds 0.08999% -170: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1} and fp2{1.0002} exceeds 0.011% -152: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-20} exceeds 1e-05% -153: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-30} exceeds 1e-05% -154: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{-1e-10} exceeds 0.1% -155: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{0.123457} exceeds 0.0001% -159: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{-0.123457} exceeds 0.001% -163: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.23456e-10} and fp2{1.23457e-11} exceeds 0.001% -164: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.111e-10} and fp2{1.112e-10} exceeds 0.08999% -165: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.112e-10} and fp2{1.111e-10} exceeds 0.08999% -170: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1} and fp2{1.0002} exceeds 0.011% -204: error in "test_CHECK_SMALL": absolute value of 1e-6{1e-06} exceeds 1e-07 -219: error in "test_close_at_tolerance": difference between fp1{1.00000001} and fp2{1.00000002} exceeds 1e-06% -226: error in "test_close_at_tolerance": check close_at_tolerance( epsilon )( fp1, fp2 ) failed for ( 1.23456e-10, 1.23457e-10 ) diff --git a/test/test_tools_test.cpp b/test/test_tools_test.cpp index 33589989..8e329da0 100644 --- a/test/test_tools_test.cpp +++ b/test/test_tools_test.cpp @@ -31,6 +31,11 @@ #include #include +#ifdef BOOST_MSVC +# pragma warning(push) +# pragma warning(disable: 4702) // unreachable code +#endif + using namespace boost::unit_test; using namespace boost::test_tools; diff --git a/test/token_iterator_test.cpp b/test/token_iterator_test.cpp index 1116e127..71188567 100644 --- a/test/token_iterator_test.cpp +++ b/test/token_iterator_test.cpp @@ -153,7 +153,7 @@ void foo( Iter b, Iter e ) moo( utf::make_range_token_iterator( b, e, (utf::kept_delimeters = utf::dt_isspace, utf::dropped_delimeters = "2" )) ); } -inline char loo( char c ) { return (std::toupper)( c ); } +inline char loo( char c ) { return (char)(std::toupper)( c ); } BOOST_AUTO_TEST_CASE( test_make_range_token_iterator ) {