Просмотр исходного кода

Make the test reporting system handle the bcp tests properly

[SVN r61925]
Steven Watanabe 16 лет назад
Родитель
Сommit
46dc079210
2 измененных файлов с 6 добавлено и 2 удалено
  1. 1 1
      tools/build
  2. 5 1
      tools/regression/src/process_jam_log.cpp

+ 1 - 1
tools/build

@@ -1 +1 @@
-Subproject commit d4ba79eba56937a1ecd063c2d2568b9ce8f77fd7
+Subproject commit 2844aa9b1dc270cbe1a82529518274af3f624bca

+ 5 - 1
tools/regression/src/process_jam_log.cpp

@@ -199,6 +199,10 @@ namespace
   {
   {
     std::string result;
     std::string result;
     string::size_type start_pos( path.find( "libs/" ) );
     string::size_type start_pos( path.find( "libs/" ) );
+    if ( start_pos == string::npos ) {
+      start_pos = path.find( "tools/" );
+    }
+
     if ( start_pos != string::npos )
     if ( start_pos != string::npos )
     {
     {
       // The path format is ...libs/functional/hash/test/something.test/....      
       // The path format is ...libs/functional/hash/test/something.test/....      
@@ -214,7 +218,7 @@ namespace
       // file.
       // file.
 
 
       std::string interesting;
       std::string interesting;
-      start_pos += 5;
+      start_pos = path.find( '/', start_pos ) + 1;
       string::size_type end_pos( path.find( ".test/", start_pos ) );
       string::size_type end_pos( path.find( ".test/", start_pos ) );
       end_pos = path.rfind('/', end_pos);
       end_pos = path.rfind('/', end_pos);
       if (path.substr(end_pos - 5, 5) == "/test")
       if (path.substr(end_pos - 5, 5) == "/test")

粤ICP备19079148号