From 5e5e24e476b0d78e25b23eba6f269d5868e3d3ec Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sun, 31 Dec 2006 17:26:12 +0000
Subject: [PATCH] bbv2 updates.

[SVN r36551]
---
 performance/main.cpp |   1 -
 test/Jamfile         | 238 -------------------------------------------
 test/Jamfile.v2      |   3 +-
 3 files changed, 2 insertions(+), 240 deletions(-)
 delete mode 100644 test/Jamfile

diff --git a/performance/main.cpp b/performance/main.cpp
index caf2afa2..203f6bd5 100644
--- a/performance/main.cpp
+++ b/performance/main.cpp
@@ -261,5 +261,4 @@ 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
deleted file mode 100644
index 5702cd06..00000000
--- a/test/Jamfile
+++ /dev/null
@@ -1,238 +0,0 @@
-# copyright John Maddock 2003
-# Distributed under the Boost Software License, Version 1.0. 
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http://www.boost.org/LICENSE_1_0.txt.
-
-subproject libs/regex/test ;
-
-# bring in the rules for testing
-import testing ;
-subinclude libs/regex/test/captures ;
-
-R_SOURCE = 
-basic_tests.cpp
-main.cpp
-test_alt.cpp
-test_anchors.cpp
-test_asserts.cpp
-test_backrefs.cpp
-test_deprecated.cpp
-test_emacs.cpp
-test_escapes.cpp
-test_grep.cpp
-test_locale.cpp
-test_mfc.cpp
-test_non_greedy_repeats.cpp
-test_perl_ex.cpp
-test_replace.cpp
-test_sets.cpp
-test_simple_repeats.cpp
-test_tricky_cases.cpp
-test_icu.cpp
-test_unicode.cpp
-test_overloads.cpp
-test_operators.cpp
-;
-
-#
-# test for MFC by looking inside VC++ include directories:
-#
-if ! $(gMFC_CHECK)
-{
-   gMFC_CHECK = true ;
-   if $(VS71COMNTOOLS)
-   {
-      VS71COMNTOOLS = $(VS71COMNTOOLS:J=" ") ;
-      if [ GLOB $(VS71COMNTOOLS)..\\..\\VC7\\atlmfc\\include : cstringt.h ]
-      {
-         ECHO MFC/ATL regex wrappers will be tested when building with VC7.1 ;
-         REGEX_MFC_OPTS += "<vc-7_1><*><define>TEST_MFC=1" ;
-      }
-   }
-   if $(VSCOMNTOOLS)
-   {
-      VSCOMNTOOLS = $(VSCOMNTOOLS:J=" ") ;
-      if [ GLOB $(VSCOMNTOOLS)\\..\\..\\VC7\\atlmfc\\include : cstringt.h ]
-      {
-         ECHO MFC/ATL regex wrappers will be tested when building with VC7 ;
-         REGEX_MFC_OPTS += "<vc7><*><define>TEST_MFC=1" ;
-         REGEX_MFC_OPTS += "<vc7-stlport><*><define>TEST_MFC=1" ;
-         REGEX_MFC_OPTS += "<vc-7_0><*><define>TEST_MFC=1" ;
-         REGEX_MFC_OPTS += "<vc-7_0-stlport><*><define>TEST_MFC=1" ;
-      }
-   }
-   if $(VS80COMNTOOLS)
-   {
-      VS80COMNTOOLS = $(VS80COMNTOOLS:J=" ") ;
-      if [ GLOB $(VS80COMNTOOLS)..\\..\\VC8\\atlmfc\\include : cstringt.h ]
-      {
-         ECHO MFC/ATL regex wrappers will be tested when building with VC8 ;
-         REGEX_MFC_OPTS += "<vc-8_0><*><define>TEST_MFC=1" ;
-      }
-   }
-}
-
-#
-# this template defines the options common to
-# all regex tests:
-#
-template test 
-   : <template>../build/regex-options 
-     <template>../build/regex-test-options
-     <lib>../build/boost_regex            # sources
-   : <threading>multi
-     $(REGEX_MFC_OPTS)
-   ;
- 
-#
-# this template defines the options common to
-# all builds of the test/regression program:
-#
-template regression
-    : <template>test                    # sources
-      regress/$(R_SOURCE)
-    ;
-
-#
-# rule for simple regex test programs:
-#
-rule regex-test ( name : sources + : requirements * : input-files * )
-{
-    return [ run $(sources)
-               :
-               : $(input-files)
-               : $(requirements)
-               : $(name) ] ;
-}
-
-#
-# this template defines the options common to
-# all regex dll tests:
-#
-template test-dll 
-   : <template>../build/regex-dll-options 
-     <template>../build/regex-test-options
-     <dll>../build/boost_regex            # sources
-   : <threading>multi
-   ;
- 
-#
-# this template defines the options common to
-# all builds of the test/regression program:
-#
-template regression-dll
-    : <template>test-dll                    # sources
-      regress/$(R_SOURCE)
-    ;
-
-test-suite regex
-      : 
-      [ regex-test regex_regress
-          : <template>regression     # sources
-          :                          # requirements
-          :                          # input files
-      ]
-
-      [ regex-test posix_api_check
-          : <template>test                      # sources
-            c_compiler_checks/posix_api_check.c
-      ]
-
-      [ compile <template>test c_compiler_checks/wide_posix_api_check.c 
-          : : wide_posix_api_check_c ]
-
-      [ regex-test posix_api_check_cpp
-          : <template>test                      # sources
-            c_compiler_checks/posix_api_check.cpp
-      ]
-
-      [ regex-test wide_posix_api_check_cpp
-          : <template>test                      # sources
-            c_compiler_checks/wide_posix_api_check.cpp
-      ]
-
-      [ regex-test bad_expression_test
-          : <template>test                      # sources
-            pathology/bad_expression_test.cpp
-            
-      ]
-
-      [ regex-test recursion_test
-          : <template>test                      # sources
-            pathology/recursion_test.cpp
-            
-      ]
-      
-      [ run unicode/unicode_iterator_test.cpp ]
-      
-      [ regex-test static_mutex_test
-          : <template>test-dll                  # sources
-            static_mutex/static_mutex_test.cpp
-            <dll>../../thread/build/boost_thread
-          : <define>BOOST_THREAD_USE_DLL=1
-      ]
-      [ regex-test object_cache_test
-          : <template>test                      # sources
-            object_cache/object_cache_test.cpp
-      ]
-      
-      [ run config_info/regex_config_info.cpp <template>test 
-      : : : <test-info>always_show_run_output ]
-
-      [ run config_info/regex_config_info.cpp <template>test-dll 
-      : : : <test-info>always_show_run_output
-      : regex_dll_config_info ]
-
-      [ run collate_info/collate_info.cpp <template>test
-      : : : <test-info>always_show_run_output ]
-      
-      [ regex-test regex_regress_dll
-          : <template>regression-dll     # sources
-          :                              # requirements
-          :                              # input files
-      ]
-
-      [ compile concepts/concept_check.cpp
-      ]
-      [ compile concepts/icu_concept_check.cpp
-      ]
-      
-     [ run
-    # sources
-    captures/captures_test.cpp
-    <template>../build/regex-options
-    # dependencies
-    <lib>captures/boost_regex_extra
-    
- :  # additional args
- :  # test-files
- :  # requirements
-    <threading>multi
-    <define>BOOST_REGEX_MATCH_EXTRA=1
-    <define>BOOST_REGEX_NO_LIB=1
- :  # test name
-    captures_test
- ]
-
-;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 6feb981e..e46fafbf 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -4,7 +4,7 @@
 # http://www.boost.org/LICENSE_1_0.txt.
 
 project
-    : requirements <threading>multi <link>shared:<define>BOOST_REGEX_DYN_LINK=1
+    : requirements <threading>multi <link>shared:<define>BOOST_REGEX_DYN_LINK=1 <toolset>msvc-7.1:<define>TEST_MFC=1 <toolset>msvc-7.0:<define>TEST_MFC=1
     ;
 
 #
@@ -134,3 +134,4 @@ test-suite regex
 
 
 
+