[Boost-commit] svn:boost r38914 - trunk/tools/regression

From: grafikrobot_at_[hidden]
Date: 2007-08-24 19:27:15

Author: grafik
Date: 2007-08-24 19:27:14 EDT (Fri, 24 Aug 2007)
New Revision: 38914
URL: http://svn.boost.org/trac/boost/changeset/38914

Log:
Reverting changes from revision [http://svn.boost.org/trac/boost/changeset/38800 38800] as it break XSLT regression reports.
Text files modified: 
   trunk/tools/regression/process_jam_log.cpp |    72 +++++++++++++++++++++------------------ 
   1 files changed, 38 insertions(+), 34 deletions(-)

Modified: trunk/tools/regression/process_jam_log.cpp
==============================================================================
--- trunk/tools/regression/process_jam_log.cpp	(original)
+++ trunk/tools/regression/process_jam_log.cpp	2007-08-24 19:27:14 EDT (Fri, 24 Aug 2007)
@@ -128,15 +128,10 @@
   {
     string temp( s );
     convert_path_separators( temp );
-    string::size_type pos = temp.find_last_of( "/");
-    if(pos == string::npos)
-        temp = "./";
-    else{
-        temp.erase( pos ); // remove leaf
+    temp.erase( temp.find_last_of( "/" ) ); // remove leaf
     temp = split( trim_left( temp ) ).back();
     if ( temp[0] == '.' ) temp.erase( 0, temp.find_first_not_of( "./" ) ); 
     else temp.erase( 0, locate_root.string().size()+1 );
-    }
     if ( echo )
         std::cout << "\ttarget_directory( \"" << s << "\") -> \"" << temp << "\"" << std::endl;
     return temp;
@@ -176,43 +171,52 @@
   // returns library name corresponding to that path.
   string test_path_to_library_name( string const& path )
   {
-    // The path format is ...libs/.../something.test/....      
-    // So, the part between "libs" and "something.test" can be considered
+    std::string result;
+    string::size_type start_pos( path.find( "libs/" ) );
+    if ( start_pos != string::npos )
+    {
+      // The path format is ...libs/functional/hash/test/something.test/....      
+      // So, the part between "libs" and "test/something.test" can be considered
       // as library name. But, for some libraries tests are located too deep,
       // say numeric/ublas/test/test1 directory, and some libraries have tests
-    // in several subdirectories (regex/example and regex/test). So, its
-    // not a "library name" as it may include subdirectories
+      // in several subdirectories (regex/example and regex/test). So, nested
+      // directory may belong to several libraries.
 
-    string::size_type end_pos = path.find(".test/");
-    end_pos = path.rfind("/", end_pos);
+      // To disambituate, it's possible to place a 'sublibs' file in
+      // a directory. It means that child directories are separate libraries.
+      // It's still possible to have tests in the directory that has 'sublibs'
+      // file.
+
+      std::string interesting;
+      start_pos += 5;
+      string::size_type end_pos( path.find( ".test/", start_pos ) );
+      end_pos = path.rfind('/', end_pos);
+      if (path.substr(end_pos - 5, 5) == "/test")
+        interesting = path.substr( start_pos, end_pos - 5 - start_pos );
+      else
+        interesting = path.substr( start_pos, end_pos - start_pos );
 
-    string::size_type start_pos;
-    string::size_type pos = end_pos;
-    unsigned int i;
-    for(i = 0;; ++i){
-        start_pos = path.rfind("/", pos - 1);
-
-        if ( start_pos == string::npos )
-            return string(); // empty string
-
-        ++start_pos;
-
-        const std::string dir = path.substr(start_pos, pos - start_pos);
-        if(0 == i){
-           // if this directory is either "test" or "example"
-           // skip it in order to be compatible with testing.jam
-           if("test" == dir
-           || "example" == dir){
-                end_pos = start_pos - 1;
+      // Take slash separate elements until we have corresponding 'sublibs'.
+      end_pos = 0;
+      for(;;)
+      {
+        end_pos = interesting.find('/', end_pos);
+        if (end_pos == string::npos) {
+          result = interesting;
+          break;
         }
+        result = interesting.substr(0, end_pos);
+
+        if ( fs::exists( ( boost_root / "libs" ) / result / "sublibs" ) )
+        {
+          end_pos = end_pos + 1;
         }
-        if("libs" == dir){
-            start_pos = pos + 1;
+        else
           break;
       }
-        pos = start_pos - 1;
     }
-    return path.substr(start_pos, end_pos - start_pos);
+
+    return result;
   }
 
   // Tries to find target name in the string 'msg', starting from