From a56990d55acbde69ba9485b05d8d82301c115723 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Fri, 20 May 2005 15:35:44 +0000
Subject: [PATCH] Internalise Boost.Test dependency.

[SVN r29100]
---
 performance/main.cpp                    |  1 +
 test/Jamfile                            | 10 ++++------
 test/Jamfile.v2                         | 14 ++++++--------
 test/captures/captures_test.cpp         |  1 +
 test/collate_info/collate_info.cpp      |  2 ++
 test/object_cache/object_cache_test.cpp |  2 ++
 test/pathology/bad_expression_test.cpp  |  1 +
 test/pathology/recursion_test.cpp       |  2 +-
 test/regress/main.cpp                   |  2 ++
 test/unicode/unicode_iterator_test.cpp  |  1 +
 10 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/performance/main.cpp b/performance/main.cpp
index 203f6bd5..caf2afa2 100644
--- a/performance/main.cpp
+++ b/performance/main.cpp
@@ -261,4 +261,5 @@ int cpp_main(int argc, char * argv[])
    return 0;
 }
 
+#include <boost/test/included/prg_exec_monitor.hpp>
 
diff --git a/test/Jamfile b/test/Jamfile
index ebe04d5c..1f033d56 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -85,7 +85,6 @@ template test
 template regression
     : <template>test                    # sources
       regress/$(R_SOURCE)
-      <lib>../../test/build/boost_prg_exec_monitor
     ;
 
 #
@@ -118,7 +117,6 @@ template test-dll
 template regression-dll
     : <template>test-dll                    # sources
       regress/$(R_SOURCE)
-      <lib>../../test/build/boost_prg_exec_monitor
     ;
 
 test-suite regex
@@ -150,13 +148,13 @@ test-suite regex
       [ regex-test bad_expression_test
           : <template>test                      # sources
             pathology/bad_expression_test.cpp
-            <lib>../../test/build/boost_test_exec_monitor
+            
       ]
 
       [ regex-test recursion_test
           : <template>test                      # sources
             pathology/recursion_test.cpp
-            <lib>../../test/build/boost_test_exec_monitor
+            
       ]
       
       [ run unicode/unicode_iterator_test.cpp ]
@@ -179,7 +177,7 @@ test-suite regex
       : : : <test-info>always_show_run_output
       : regex_dll_config_info ]
 
-      [ run collate_info/collate_info.cpp <template>test <lib>../../test/build/boost_prg_exec_monitor
+      [ run collate_info/collate_info.cpp <template>test
       : : : <test-info>always_show_run_output ]
       
       [ regex-test regex_regress_dll
@@ -199,7 +197,7 @@ test-suite regex
     <template>../build/regex-options
     # dependencies
     <lib>captures/boost_regex_extra
-    <lib>../../test/build/boost_test_exec_monitor
+    
  :  # additional args
  :  # test-files
  :  # requirements
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index df22cf61..a2447521 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -41,23 +41,22 @@ test_overloads.cpp
 test_operators.cpp
 ;
 
-local regress-sources = regress/$(R_SOURCE)
-                        ../../test/build//boost_prg_exec_monitor ;
+local regress-sources = regress/$(R_SOURCE) ;
 
 test-suite regex
       : 
-      [ run regress/$(R_SOURCE) ../../test/build//boost_prg_exec_monitor ../build//boost_regex ]
-      #[ run c_compiler_checks/posix_api_check.c ../../test/build//boost_prg_exec_monitor ../build//boost_regex ]
+      [ run regress/$(R_SOURCE) ../build//boost_regex ]
+      #[ run c_compiler_checks/posix_api_check.c ../build//boost_regex ]
       #[ compile c_compiler_checks/wide_posix_api_check.c  ]
       [ run c_compiler_checks/posix_api_check.cpp ../build//boost_regex ]
       [ run c_compiler_checks/wide_posix_api_check.cpp ../build//boost_regex ]
 
       [ run pathology/bad_expression_test.cpp
-            ../../test/build//boost_test_exec_monitor ../build//boost_regex
+            ../build//boost_regex
       ]
 
       [ run pathology/recursion_test.cpp
-            ../../test/build//boost_test_exec_monitor ../build//boost_regex
+            ../build//boost_regex
       ]
       
       [ run unicode/unicode_iterator_test.cpp ../build//boost_regex ]
@@ -68,7 +67,7 @@ test-suite regex
       ]
       
       [ run config_info/regex_config_info.cpp ../build//boost_regex ]
-      [ run collate_info/collate_info.cpp ../build//boost_regex ../../test/build//boost_prg_exec_monitor ]
+      [ run collate_info/collate_info.cpp ../build//boost_regex ]
 
       [ compile concepts/concept_check.cpp ../build//boost_regex
       ]
@@ -79,7 +78,6 @@ test-suite regex
     # sources
     captures/captures_test.cpp
     captures//boost_regex_extra
-    ../../test/build//boost_test_exec_monitor
  :  # additional args
  :  # test-files
  :  # requirements
diff --git a/test/captures/captures_test.cpp b/test/captures/captures_test.cpp
index e833cbfc..fcfd51f3 100644
--- a/test/captures/captures_test.cpp
+++ b/test/captures/captures_test.cpp
@@ -113,3 +113,4 @@ int test_main(int , char* [])
    return 0;
 }
 
+#include <boost/test/included/test_exec_monitor.hpp>
diff --git a/test/collate_info/collate_info.cpp b/test/collate_info/collate_info.cpp
index 4c400059..58750951 100644
--- a/test/collate_info/collate_info.cpp
+++ b/test/collate_info/collate_info.cpp
@@ -243,3 +243,5 @@ int cpp_main(int /*argc*/, char * /*argv*/[])
 #endif
    return 0;
 }
+
+#include <boost/test/included/prg_exec_monitor.hpp>
diff --git a/test/object_cache/object_cache_test.cpp b/test/object_cache/object_cache_test.cpp
index 418740b9..0f0d6521 100644
--- a/test/object_cache/object_cache_test.cpp
+++ b/test/object_cache/object_cache_test.cpp
@@ -73,3 +73,5 @@ int test_main(int /*argc*/, char * /*argv*/[])
    return 0;
 }
 
+#include <boost/test/included/test_exec_monitor.hpp>
+
diff --git a/test/pathology/bad_expression_test.cpp b/test/pathology/bad_expression_test.cpp
index 6b34587e..05cc5b12 100644
--- a/test/pathology/bad_expression_test.cpp
+++ b/test/pathology/bad_expression_test.cpp
@@ -47,3 +47,4 @@ int test_main( int , char* [] )
    return 0;
 }
 
+#include <boost/test/included/test_exec_monitor.hpp>
diff --git a/test/pathology/recursion_test.cpp b/test/pathology/recursion_test.cpp
index 750fd652..829caed0 100644
--- a/test/pathology/recursion_test.cpp
+++ b/test/pathology/recursion_test.cpp
@@ -58,4 +58,4 @@ int test_main( int , char* [] )
    return 0;
 }
 
-
+#include <boost/test/included/test_exec_monitor.hpp>
diff --git a/test/regress/main.cpp b/test/regress/main.cpp
index 64ebdbb1..9111b660 100644
--- a/test/regress/main.cpp
+++ b/test/regress/main.cpp
@@ -129,3 +129,5 @@ void test(const wchar_t& c, const test_invalid_regex_tag& tag)
    do_test(c, tag);
 }
 #endif
+
+#include <boost/test/included/prg_exec_monitor.hpp>
diff --git a/test/unicode/unicode_iterator_test.cpp b/test/unicode/unicode_iterator_test.cpp
index fd5ca3f8..a6f267bb 100644
--- a/test/unicode/unicode_iterator_test.cpp
+++ b/test/unicode/unicode_iterator_test.cpp
@@ -205,3 +205,4 @@ int test_main( int, char* [] )
    return 0;
 }
 
+#include <boost/test/included/test_exec_monitor.hpp>