From 94904f9725693b76b711e7bb06d22cc11d66ff86 Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven@providere-consulting.com>
Date: Wed, 27 Mar 2013 20:59:52 +0000
Subject: [PATCH] Fix target directory calculation for libraries that have test
 sources in a subdirectory.  The compile actions were (incorrectly) being
 separated from the link and run actions in regex, spirit and others.

[SVN r83612]
---
 tools/regression/src/process_jam_log.cpp | 32 ++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tools/regression/src/process_jam_log.cpp b/tools/regression/src/process_jam_log.cpp
index 8f1b19b06a..b3b61b4030 100644
--- a/tools/regression/src/process_jam_log.cpp
+++ b/tools/regression/src/process_jam_log.cpp
@@ -144,6 +144,10 @@ namespace
   }
 
 
+  string test_path_to_library_name( string const& path );
+  string test_name( const string & s );
+
+
 //  extract a target directory path from a jam target string  ----------------//
 //  s may be relative to the initial_path:
 //    ..\..\..\libs\foo\build\bin\libfoo.lib\vc7\debug\runtime-link-dynamic\boo.obj
@@ -160,6 +164,34 @@ namespace
     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 );
+
+    std::string testid = test_path_to_library_name( temp ) + "/" + test_name( temp );
+    test2info_map::const_iterator info = test2info.find(testid);
+    if ( info != test2info.end() )
+    {
+      // Only keep path components that are part of the
+      // build variant.
+
+      string source_directory = info->second.file_path;
+      string::size_type last = source_directory.find_last_of( "/" );
+      if ( last == string::npos )
+        source_directory.clear();
+      else
+        source_directory.erase( last );
+
+      // find the start of the shared tail
+      string::size_type source_pos = source_directory.size(), temp_pos = temp.size();
+      for ( ; source_pos != 0 && temp_pos != 0; --source_pos, --temp_pos )
+      {
+        if ( source_directory[ source_pos - 1 ] != temp[ temp_pos - 1 ] ) break;
+      }
+
+      // erase all path components in the shared tail
+      temp_pos = temp.find( '/', temp_pos );
+      if ( temp_pos != string::npos )
+        temp.erase( temp_pos );
+    }
+
     if ( echo )
         std::cout << "\ttarget_directory( \"" << s << "\") -> \"" << temp << "\"" << std::endl;
     return temp;