From b58521163bbd1f38bd4bc1a7c9c7fed25728a4de Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Wed, 7 Jun 2006 16:38:23 +0000
Subject: [PATCH] Changed test names to prevent directory/test name conflict.

[SVN r34221]
---
 example/Jamfile.v2 | 6 ++++--
 test/Jamfile.v2    | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/example/Jamfile.v2 b/example/Jamfile.v2
index 894eb015..cf79614c 100644
--- a/example/Jamfile.v2
+++ b/example/Jamfile.v2
@@ -5,7 +5,7 @@ project
     ;
 
 
-rule regex-test-run ( sources + : input * )
+rule regex-test-run ( sources + : input * : name * )
 {
         return [ 
            run
@@ -18,13 +18,14 @@ rule regex-test-run ( sources + : input * )
          :  # test-files
          :  # requirements
          :  # test name
+            $(name)
         ] ;
 }
 
 test-suite regex-examples :
 
 [ regex-test-run timer/regex_timer.cpp : $(BOOST_ROOT)/libs/regex/example/timer/input_script.txt ]
-[ regex-test-run grep/grep.cpp ../../program_options/build//boost_program_options/<link>static : -n -b $(BOOST_ROOT)/boost/regex.hpp $(BOOST_ROOT)/boost/type_traits.hpp ]
+[ regex-test-run grep/grep.cpp ../../program_options/build//boost_program_options/<link>static : -n -b $(BOOST_ROOT)/boost/regex.hpp $(BOOST_ROOT)/boost/type_traits.hpp : test_grep ]
 [ regex-test-run snippets/credit_card_example.cpp ]
 [ regex-test-run snippets/mfc_example.cpp ]
 [ regex-test-run snippets/icu_example.cpp ]
@@ -54,3 +55,4 @@ test-suite regex-examples :
 
 
 
+
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 0693f2fa..d4a060f5 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -97,7 +97,7 @@ test-suite regex
       ]    
 
       [ run collate_info/collate_info.cpp ../build//boost_regex
-      : : : <test-info>always_show_run_output ]
+      : : : <test-info>always_show_run_output : test_collate_info ]
 
 
       [ compile concepts/concept_check.cpp ../build//boost_regex
@@ -119,4 +119,4 @@ test-suite regex
     captures_test
  ]
 ;
-      
\ No newline at end of file
+