From 965cb2cfba5b47bb7fe70ff449d760f81dff5eac Mon Sep 17 00:00:00 2001
From: Gennadiy Rozental <rogeeff@gmail.com>
Date: Mon, 26 Aug 2002 08:17:45 +0000
Subject: [PATCH] borland workarounds

[SVN r15087]
---
 test/error_handling_test.pattern | 400 +++++++++++++++----------------
 test/errors_handling_test.cpp    |  13 +
 2 files changed, 213 insertions(+), 200 deletions(-)

diff --git a/test/error_handling_test.pattern b/test/error_handling_test.pattern
index 4b865e2b..adf85d92 100644
--- a/test/error_handling_test.pattern
+++ b/test/error_handling_test.pattern
@@ -60,7 +60,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_function"
 (free function)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_function": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_function": error_on_demand() BOOST_ERROR
 Leaving  test case "bad_function"
 Leaving  test case "Errors handling test"
 
@@ -73,7 +73,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_test::test"
 (user test case)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_test::test": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_test::test": error_on_demand() BOOST_ERROR
 Leaving  test case "bad_test::test"
 Leaving  test case "Errors handling test"
 
@@ -86,7 +86,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_function_param"
 (parameterized free function)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_function_param": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_function_param": error_on_demand() BOOST_ERROR
 Leaving  test case "bad_function_param"
 Leaving  test case "Errors handling test"
 
@@ -99,7 +99,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_test::test_param"
 (parameterized user test case)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_test::test_param": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_test::test_param": error_on_demand() BOOST_ERROR
 Leaving  test case "bad_test::test_param"
 Leaving  test case "Errors handling test"
 
@@ -113,7 +113,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_function"
 (free function)
 Exception in "bad_function": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 Leaving  test case "bad_function"
 Leaving  test case "Errors handling test"
 
@@ -127,7 +127,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_test::test"
 (user test case)
 Exception in "bad_test::test": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 Leaving  test case "bad_test::test"
 Leaving  test case "Errors handling test"
 
@@ -141,7 +141,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_function_param"
 (parameterized free function)
 Exception in "bad_function_param": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 Leaving  test case "bad_function_param"
 Leaving  test case "Errors handling test"
 
@@ -155,7 +155,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_test::test_param"
 (parameterized user test case)
 Exception in "bad_test::test_param": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 Leaving  test case "bad_test::test_param"
 Leaving  test case "Errors handling test"
 
@@ -169,7 +169,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_function"
 (free function)
 Exception in "bad_function": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 Leaving  test case "bad_function"
 Leaving  test case "Errors handling test"
 
@@ -183,7 +183,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_test::test"
 (user test case)
 Exception in "bad_test::test": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 Leaving  test case "bad_test::test"
 Leaving  test case "Errors handling test"
 
@@ -197,7 +197,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_function_param"
 (parameterized free function)
 Exception in "bad_function_param": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 Leaving  test case "bad_function_param"
 Leaving  test case "Errors handling test"
 
@@ -211,7 +211,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_test::test_param"
 (parameterized user test case)
 Exception in "bad_test::test_param": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 Leaving  test case "bad_test::test_param"
 Leaving  test case "Errors handling test"
 
@@ -224,7 +224,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_function"
 (free function)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
 Leaving  test case "bad_function"
 Leaving  test case "Errors handling test"
 
@@ -237,7 +237,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_test::test"
 (user test case)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
 Leaving  test case "bad_test::test"
 Leaving  test case "Errors handling test"
 
@@ -250,7 +250,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_function_param"
 (parameterized free function)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
 Leaving  test case "bad_function_param"
 Leaving  test case "Errors handling test"
 
@@ -263,7 +263,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_test::test_param"
 (parameterized user test case)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
 Leaving  test case "bad_test::test_param"
 Leaving  test case "Errors handling test"
 
@@ -277,10 +277,10 @@ Entering test case "Errors handling test"
 Entering test case "bad_function"
 (free function)
 Exception in "bad_function": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function": testing aborted
 Leaving  test case "bad_function"
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 Leaving  test case "Errors handling test"
 
 ===========================
@@ -293,10 +293,10 @@ Entering test case "Errors handling test"
 Entering test case "bad_test::test"
 (user test case)
 Exception in "bad_test::test": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test": testing aborted
 Leaving  test case "bad_test::test"
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 Leaving  test case "Errors handling test"
 
 ===========================
@@ -309,10 +309,10 @@ Entering test case "Errors handling test"
 Entering test case "bad_function_param"
 (parameterized free function)
 Exception in "bad_function_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function_param": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function_param": testing aborted
 Leaving  test case "bad_function_param"
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 Leaving  test case "Errors handling test"
 
 ===========================
@@ -325,10 +325,10 @@ Entering test case "Errors handling test"
 Entering test case "bad_test::test_param"
 (parameterized user test case)
 Exception in "bad_test::test_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test_param": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test_param": testing aborted
 Leaving  test case "bad_test::test_param"
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 Leaving  test case "Errors handling test"
 
 ===========================
@@ -392,7 +392,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_function"
 (free function)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_function": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_function": error_on_demand() BOOST_ERROR
 Leaving  test case "bad_function"
 Leaving  test case "Errors handling test"
 
@@ -405,7 +405,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_test::test"
 (user test case)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_test::test": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_test::test": error_on_demand() BOOST_ERROR
 Leaving  test case "bad_test::test"
 Leaving  test case "Errors handling test"
 
@@ -418,7 +418,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_function_param"
 (parameterized free function)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_function_param": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_function_param": error_on_demand() BOOST_ERROR
 Leaving  test case "bad_function_param"
 Leaving  test case "Errors handling test"
 
@@ -431,7 +431,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_test::test_param"
 (parameterized user test case)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_test::test_param": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_test::test_param": error_on_demand() BOOST_ERROR
 Leaving  test case "bad_test::test_param"
 Leaving  test case "Errors handling test"
 
@@ -445,7 +445,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_function"
 (free function)
 Exception in "bad_function": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 Leaving  test case "bad_function"
 Leaving  test case "Errors handling test"
 
@@ -459,7 +459,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_test::test"
 (user test case)
 Exception in "bad_test::test": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 Leaving  test case "bad_test::test"
 Leaving  test case "Errors handling test"
 
@@ -473,7 +473,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_function_param"
 (parameterized free function)
 Exception in "bad_function_param": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 Leaving  test case "bad_function_param"
 Leaving  test case "Errors handling test"
 
@@ -487,7 +487,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_test::test_param"
 (parameterized user test case)
 Exception in "bad_test::test_param": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 Leaving  test case "bad_test::test_param"
 Leaving  test case "Errors handling test"
 
@@ -501,7 +501,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_function"
 (free function)
 Exception in "bad_function": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 Leaving  test case "bad_function"
 Leaving  test case "Errors handling test"
 
@@ -515,7 +515,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_test::test"
 (user test case)
 Exception in "bad_test::test": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 Leaving  test case "bad_test::test"
 Leaving  test case "Errors handling test"
 
@@ -529,7 +529,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_function_param"
 (parameterized free function)
 Exception in "bad_function_param": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 Leaving  test case "bad_function_param"
 Leaving  test case "Errors handling test"
 
@@ -543,7 +543,7 @@ Entering test case "Errors handling test"
 Entering test case "bad_test::test_param"
 (parameterized user test case)
 Exception in "bad_test::test_param": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 Leaving  test case "bad_test::test_param"
 Leaving  test case "Errors handling test"
 
@@ -556,7 +556,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_function"
 (free function)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
 Leaving  test case "bad_function"
 Leaving  test case "Errors handling test"
 
@@ -569,7 +569,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_test::test"
 (user test case)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
 Leaving  test case "bad_test::test"
 Leaving  test case "Errors handling test"
 
@@ -582,7 +582,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_function_param"
 (parameterized free function)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
 Leaving  test case "bad_function_param"
 Leaving  test case "Errors handling test"
 
@@ -595,7 +595,7 @@ Entering test case "Errors handling test"
 
 Entering test case "bad_test::test_param"
 (parameterized user test case)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
 Leaving  test case "bad_test::test_param"
 Leaving  test case "Errors handling test"
 
@@ -609,10 +609,10 @@ Entering test case "Errors handling test"
 Entering test case "bad_function"
 (free function)
 Exception in "bad_function": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function": testing aborted
 Leaving  test case "bad_function"
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 Leaving  test case "Errors handling test"
 
 ===========================
@@ -625,10 +625,10 @@ Entering test case "Errors handling test"
 Entering test case "bad_test::test"
 (user test case)
 Exception in "bad_test::test": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test": testing aborted
 Leaving  test case "bad_test::test"
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 Leaving  test case "Errors handling test"
 
 ===========================
@@ -641,10 +641,10 @@ Entering test case "Errors handling test"
 Entering test case "bad_function_param"
 (parameterized free function)
 Exception in "bad_function_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function_param": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function_param": testing aborted
 Leaving  test case "bad_function_param"
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 Leaving  test case "Errors handling test"
 
 ===========================
@@ -657,10 +657,10 @@ Entering test case "Errors handling test"
 Entering test case "bad_test::test_param"
 (parameterized user test case)
 Exception in "bad_test::test_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test_param": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test_param": testing aborted
 Leaving  test case "bad_test::test_param"
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 Leaving  test case "Errors handling test"
 
 ===========================
@@ -696,28 +696,28 @@ error_on_demand() BOOST_MESSAGE
 log level: 2; error type: user error; test case type: free function;
 Running 1 test case...
 (free function)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_function": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_function": error_on_demand() BOOST_ERROR
 
 ===========================
 
 log level: 2; error type: user error; test case type: user test case;
 Running 1 test case...
 (user test case)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_test::test": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_test::test": error_on_demand() BOOST_ERROR
 
 ===========================
 
 log level: 2; error type: user error; test case type: parameterized free function;
 Running 1 test case...
 (parameterized free function)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_function_param": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_function_param": error_on_demand() BOOST_ERROR
 
 ===========================
 
 log level: 2; error type: user error; test case type: parameterized user test case;
 Running 1 test case...
 (parameterized user test case)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_test::test_param": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_test::test_param": error_on_demand() BOOST_ERROR
 
 ===========================
 
@@ -725,7 +725,7 @@ log level: 2; error type: cpp exception; test case type: free function;
 Running 1 test case...
 (free function)
 Exception in "bad_function": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
@@ -733,7 +733,7 @@ log level: 2; error type: cpp exception; test case type: user test case;
 Running 1 test case...
 (user test case)
 Exception in "bad_test::test": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
@@ -741,7 +741,7 @@ log level: 2; error type: cpp exception; test case type: parameterized free func
 Running 1 test case...
 (parameterized free function)
 Exception in "bad_function_param": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
@@ -749,7 +749,7 @@ log level: 2; error type: cpp exception; test case type: parameterized user test
 Running 1 test case...
 (parameterized user test case)
 Exception in "bad_test::test_param": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
@@ -757,7 +757,7 @@ log level: 2; error type:  system error; test case type: free function;
 Running 1 test case...
 (free function)
 Exception in "bad_function": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
@@ -765,7 +765,7 @@ log level: 2; error type:  system error; test case type: user test case;
 Running 1 test case...
 (user test case)
 Exception in "bad_test::test": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
@@ -773,7 +773,7 @@ log level: 2; error type:  system error; test case type: parameterized free func
 Running 1 test case...
 (parameterized free function)
 Exception in "bad_function_param": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
@@ -781,35 +781,35 @@ log level: 2; error type:  system error; test case type: parameterized user test
 Running 1 test case...
 (parameterized user test case)
 Exception in "bad_test::test_param": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 2; error type: fatal user error; test case type: free function;
 Running 1 test case...
 (free function)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 2; error type: fatal user error; test case type: user test case;
 Running 1 test case...
 (user test case)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 2; error type: fatal user error; test case type: parameterized free function;
 Running 1 test case...
 (parameterized free function)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 2; error type: fatal user error; test case type: parameterized user test case;
 Running 1 test case...
 (parameterized user test case)
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
@@ -817,9 +817,9 @@ log level: 2; error type: fatal system error; test case type: free function;
 Running 1 test case...
 (free function)
 Exception in "bad_function": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
@@ -827,9 +827,9 @@ log level: 2; error type: fatal system error; test case type: user test case;
 Running 1 test case...
 (user test case)
 Exception in "bad_test::test": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
@@ -837,9 +837,9 @@ log level: 2; error type: fatal system error; test case type: parameterized free
 Running 1 test case...
 (parameterized free function)
 Exception in "bad_function_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function_param": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function_param": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
@@ -847,9 +847,9 @@ log level: 2; error type: fatal system error; test case type: parameterized user
 Running 1 test case...
 (parameterized user test case)
 Exception in "bad_test::test_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test_param": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test_param": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
@@ -875,141 +875,141 @@ Running 1 test case...
 
 log level: 3; error type: user error; test case type: free function;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_function": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_function": error_on_demand() BOOST_ERROR
 
 ===========================
 
 log level: 3; error type: user error; test case type: user test case;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_test::test": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_test::test": error_on_demand() BOOST_ERROR
 
 ===========================
 
 log level: 3; error type: user error; test case type: parameterized free function;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_function_param": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_function_param": error_on_demand() BOOST_ERROR
 
 ===========================
 
 log level: 3; error type: user error; test case type: parameterized user test case;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_test::test_param": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_test::test_param": error_on_demand() BOOST_ERROR
 
 ===========================
 
 log level: 3; error type: cpp exception; test case type: free function;
 Running 1 test case...
 Exception in "bad_function": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
 log level: 3; error type: cpp exception; test case type: user test case;
 Running 1 test case...
 Exception in "bad_test::test": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
 log level: 3; error type: cpp exception; test case type: parameterized free function;
 Running 1 test case...
 Exception in "bad_function_param": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
 log level: 3; error type: cpp exception; test case type: parameterized user test case;
 Running 1 test case...
 Exception in "bad_test::test_param": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
 log level: 3; error type:  system error; test case type: free function;
 Running 1 test case...
 Exception in "bad_function": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 3; error type:  system error; test case type: user test case;
 Running 1 test case...
 Exception in "bad_test::test": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 3; error type:  system error; test case type: parameterized free function;
 Running 1 test case...
 Exception in "bad_function_param": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 3; error type:  system error; test case type: parameterized user test case;
 Running 1 test case...
 Exception in "bad_test::test_param": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 3; error type: fatal user error; test case type: free function;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 3; error type: fatal user error; test case type: user test case;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 3; error type: fatal user error; test case type: parameterized free function;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 3; error type: fatal user error; test case type: parameterized user test case;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 3; error type: fatal system error; test case type: free function;
 Running 1 test case...
 Exception in "bad_function": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
 log level: 3; error type: fatal system error; test case type: user test case;
 Running 1 test case...
 Exception in "bad_test::test": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
 log level: 3; error type: fatal system error; test case type: parameterized free function;
 Running 1 test case...
 Exception in "bad_function_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function_param": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function_param": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
 log level: 3; error type: fatal system error; test case type: parameterized user test case;
 Running 1 test case...
 Exception in "bad_test::test_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test_param": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test_param": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
@@ -1035,141 +1035,141 @@ Running 1 test case...
 
 log level: 4; error type: user error; test case type: free function;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_function": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_function": error_on_demand() BOOST_ERROR
 
 ===========================
 
 log level: 4; error type: user error; test case type: user test case;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_test::test": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_test::test": error_on_demand() BOOST_ERROR
 
 ===========================
 
 log level: 4; error type: user error; test case type: parameterized free function;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_function_param": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_function_param": error_on_demand() BOOST_ERROR
 
 ===========================
 
 log level: 4; error type: user error; test case type: parameterized user test case;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(45) : error in "bad_test::test_param": error_on_demand() BOOST_ERROR
+errors_handling_test.cpp(49) : error in "bad_test::test_param": error_on_demand() BOOST_ERROR
 
 ===========================
 
 log level: 4; error type: cpp exception; test case type: free function;
 Running 1 test case...
 Exception in "bad_function": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
 log level: 4; error type: cpp exception; test case type: user test case;
 Running 1 test case...
 Exception in "bad_test::test": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
 log level: 4; error type: cpp exception; test case type: parameterized free function;
 Running 1 test case...
 Exception in "bad_function_param": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
 log level: 4; error type: cpp exception; test case type: parameterized user test case;
 Running 1 test case...
 Exception in "bad_test::test_param": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
 log level: 4; error type:  system error; test case type: free function;
 Running 1 test case...
 Exception in "bad_function": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 4; error type:  system error; test case type: user test case;
 Running 1 test case...
 Exception in "bad_test::test": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 4; error type:  system error; test case type: parameterized free function;
 Running 1 test case...
 Exception in "bad_function_param": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 4; error type:  system error; test case type: parameterized user test case;
 Running 1 test case...
 Exception in "bad_test::test_param": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 4; error type: fatal user error; test case type: free function;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 4; error type: fatal user error; test case type: user test case;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 4; error type: fatal user error; test case type: parameterized free function;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 4; error type: fatal user error; test case type: parameterized user test case;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 4; error type: fatal system error; test case type: free function;
 Running 1 test case...
 Exception in "bad_function": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
 log level: 4; error type: fatal system error; test case type: user test case;
 Running 1 test case...
 Exception in "bad_test::test": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
 log level: 4; error type: fatal system error; test case type: parameterized free function;
 Running 1 test case...
 Exception in "bad_function_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function_param": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function_param": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
 log level: 4; error type: fatal system error; test case type: parameterized user test case;
 Running 1 test case...
 Exception in "bad_test::test_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test_param": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test_param": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
@@ -1216,116 +1216,116 @@ Running 1 test case...
 log level: 5; error type: cpp exception; test case type: free function;
 Running 1 test case...
 Exception in "bad_function": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
 log level: 5; error type: cpp exception; test case type: user test case;
 Running 1 test case...
 Exception in "bad_test::test": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
 log level: 5; error type: cpp exception; test case type: parameterized free function;
 Running 1 test case...
 Exception in "bad_function_param": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
 log level: 5; error type: cpp exception; test case type: parameterized user test case;
 Running 1 test case...
 Exception in "bad_test::test_param": std::runtime_error: test std::runtime error what() message
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(56) : last checkpoint: error_on_demand() throw runtime_error
+errors_handling_test.cpp(60) : last checkpoint: error_on_demand() throw runtime_error
 
 ===========================
 
 log level: 5; error type:  system error; test case type: free function;
 Running 1 test case...
 Exception in "bad_function": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 5; error type:  system error; test case type: user test case;
 Running 1 test case...
 Exception in "bad_test::test": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 5; error type:  system error; test case type: parameterized free function;
 Running 1 test case...
 Exception in "bad_function_param": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 5; error type:  system error; test case type: parameterized user test case;
 Running 1 test case...
 Exception in "bad_test::test_param": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 5; error type: fatal user error; test case type: free function;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 5; error type: fatal user error; test case type: user test case;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 5; error type: fatal user error; test case type: parameterized free function;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 5; error type: fatal user error; test case type: parameterized user test case;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 5; error type: fatal system error; test case type: free function;
 Running 1 test case...
 Exception in "bad_function": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
 log level: 5; error type: fatal system error; test case type: user test case;
 Running 1 test case...
 Exception in "bad_test::test": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
 log level: 5; error type: fatal system error; test case type: parameterized free function;
 Running 1 test case...
 Exception in "bad_function_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function_param": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function_param": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
 log level: 5; error type: fatal system error; test case type: parameterized user test case;
 Running 1 test case...
 Exception in "bad_test::test_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test_param": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test_param": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
@@ -1392,88 +1392,88 @@ Running 1 test case...
 log level: 6; error type:  system error; test case type: free function;
 Running 1 test case...
 Exception in "bad_function": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 6; error type:  system error; test case type: user test case;
 Running 1 test case...
 Exception in "bad_test::test": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 6; error type:  system error; test case type: parameterized free function;
 Running 1 test case...
 Exception in "bad_function_param": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 6; error type:  system error; test case type: parameterized user test case;
 Running 1 test case...
 Exception in "bad_test::test_param": integer divide by zero
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(61) : last checkpoint: error_on_demand() divide by zero
+errors_handling_test.cpp(65) : last checkpoint: error_on_demand() divide by zero
 
 ===========================
 
 log level: 6; error type: fatal user error; test case type: free function;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 6; error type: fatal user error; test case type: user test case;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 6; error type: fatal user error; test case type: parameterized free function;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 6; error type: fatal user error; test case type: parameterized user test case;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 6; error type: fatal system error; test case type: free function;
 Running 1 test case...
 Exception in "bad_function": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
 log level: 6; error type: fatal system error; test case type: user test case;
 Running 1 test case...
 Exception in "bad_test::test": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
 log level: 6; error type: fatal system error; test case type: parameterized free function;
 Running 1 test case...
 Exception in "bad_function_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function_param": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function_param": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
 log level: 6; error type: fatal system error; test case type: parameterized user test case;
 Running 1 test case...
 Exception in "bad_test::test_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test_param": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test_param": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
@@ -1559,61 +1559,61 @@ Running 1 test case...
 
 log level: 7; error type: fatal user error; test case type: free function;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 7; error type: fatal user error; test case type: user test case;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 7; error type: fatal user error; test case type: parameterized free function;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_function_param": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 7; error type: fatal user error; test case type: parameterized user test case;
 Running 1 test case...
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(50) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
+errors_handling_test.cpp(54) : fatal error in "bad_test::test_param": error_on_demand() BOOST_CRITICAL_ERROR
 
 ===========================
 
 log level: 7; error type: fatal system error; test case type: free function;
 Running 1 test case...
 Exception in "bad_function": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
 log level: 7; error type: fatal system error; test case type: user test case;
 Running 1 test case...
 Exception in "bad_test::test": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
 log level: 7; error type: fatal system error; test case type: parameterized free function;
 Running 1 test case...
 Exception in "bad_function_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_function_param": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_function_param": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
 log level: 7; error type: fatal system error; test case type: parameterized user test case;
 Running 1 test case...
 Exception in "bad_test::test_param": memory access violation
-e:\source code\boost\libs\test\test\errors_handling_test.cpp(66) : last checkpoint: error_on_demand() write to an invalid address
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "bad_test::test_param": testing aborted
-e:\source code\boost\libs\test\src\unit_test_suite.cpp(87) : fatal error in "Errors handling test": testing aborted
+errors_handling_test.cpp(70) : last checkpoint: error_on_demand() write to an invalid address
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "bad_test::test_param": testing aborted
+..\..\..\libs\test\build\../src\unit_test_suite.cpp(95) : fatal error in "Errors handling test": testing aborted
 
 ===========================
 
diff --git a/test/errors_handling_test.cpp b/test/errors_handling_test.cpp
index 96433e00..800a36bd 100644
--- a/test/errors_handling_test.cpp
+++ b/test/errors_handling_test.cpp
@@ -8,6 +8,10 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
+#if defined(__BORLANDC__) && (__BORLANDC__ < 0x560)
+#define _RWSTD_NO_CLASS_PARTIAL_SPEC
+#endif
+
 #include <boost/test/unit_test.hpp>
 #include <boost/test/unit_test_result.hpp>
 #include <boost/test/detail/unit_test_parameters.hpp>
@@ -174,10 +178,19 @@ test_main( int argc, char * argv[] ) {
                     test.add( BOOST_CLASS_TEST_CASE( &bad_test::test, bad_test_instance ) );
                     break;
                 case tct_param_free_function:
+// Borland bug workaround
+#if defined(__BORLANDC__) && (__BORLANDC__ < 0x560)
+                    test.add( boost::unit_test_framework::create_test_case<int*,int>( &bad_function_param, std::string( "bad_function_param" ), (int*)params, params+1 ) );
+#else
                     test.add( BOOST_PARAM_TEST_CASE( &bad_function_param, (int*)params, params+1 ) );
+#endif
                     break;
                 case tct_param_user_test_case:
+#if defined(__BORLANDC__) && (__BORLANDC__ < 0x560)
+                    test.add( boost::unit_test_framework::create_test_case<bad_test,int*,int>( &bad_test::test_param, std::string( "bad_test::test_param" ),  bad_test_instance, (int*)params, params+1 ) );
+#else
                     test.add( BOOST_PARAM_CLASS_TEST_CASE( &bad_test::test_param, bad_test_instance, (int*)params, params+1 ) );
+#endif
                     break;
                 default:
                     continue;