[Boost-commit] svn:boost r61925 - in trunk/tools: build/v2/tools regression/src

Subject: [Boost-commit] svn:boost r61925 - in trunk/tools: build/v2/tools regression/src
From: steven_at_[hidden]
Date: 2010-05-12 00:32:45

Author: steven_watanabe
Date: 2010-05-12 00:32:43 EDT (Wed, 12 May 2010)
New Revision: 61925
URL: http://svn.boost.org/trac/boost/changeset/61925

Log:
Make the test reporting system handle the bcp tests properly
Text files modified: 
   trunk/tools/build/v2/tools/testing.jam         |     8 ++++----                                
   trunk/tools/regression/src/process_jam_log.cpp |     6 +++++-                                  
   2 files changed, 9 insertions(+), 5 deletions(-)

Modified: trunk/tools/build/v2/tools/testing.jam
==============================================================================
--- trunk/tools/build/v2/tools/testing.jam	(original)
+++ trunk/tools/build/v2/tools/testing.jam	2010-05-12 00:32:43 EDT (Wed, 12 May 2010)
@@ -205,12 +205,12 @@
 local rule get-library-name ( path )
 {
     # Path is in normalized form, so all slashes are forward.
-    local match1 = [ MATCH /libs/(.*)/(test|example) : $(path) ] ;
-    local match2 = [ MATCH /libs/(.*)$ : $(path) ] ;
+    local match1 = [ MATCH /(tools|libs)/(.*)/(test|example) : $(path) ] ;
+    local match2 = [ MATCH /(tools|libs)/(.*)$ : $(path) ] ;
     local match3 = [ MATCH (/status$) : $(path) ] ;
 
-    if $(match1) { return $(match1[0]) ; }
-    else if $(match2) { return $(match2[0]) ; }
+    if $(match1) { return $(match1[2]) ; }
+    else if $(match2) { return $(match2[2]) ; }
     else if $(match3) { return "" ; }
     else if --dump-tests in [ modules.peek : ARGV ]
     {

Modified: trunk/tools/regression/src/process_jam_log.cpp
==============================================================================
--- trunk/tools/regression/src/process_jam_log.cpp	(original)
+++ trunk/tools/regression/src/process_jam_log.cpp	2010-05-12 00:32:43 EDT (Wed, 12 May 2010)
@@ -199,6 +199,10 @@
   {
     std::string result;
     string::size_type start_pos( path.find( "libs/" ) );
+    if ( start_pos == string::npos ) {
+      start_pos = path.find( "tools/" );
+    }
+
     if ( start_pos != string::npos )
     {
       // The path format is ...libs/functional/hash/test/something.test/....      
@@ -214,7 +218,7 @@
       // file.
 
       std::string interesting;
-      start_pos += 5;
+      start_pos = path.find( '/', start_pos ) + 1;
       string::size_type end_pos( path.find( ".test/", start_pos ) );
       end_pos = path.rfind('/', end_pos);
       if (path.substr(end_pos - 5, 5) == "/test")