From 887dbd32f543767156bec6297091d87ab819dc4e Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Mon, 15 Sep 2003 05:50:57 +0000
Subject: [PATCH] Fix path calculation to work when the invocation dir is set
 to "." Remove some TABS.

[SVN r20062]
---
 testing.jam    | 7 ++++---
 v1/testing.jam | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/testing.jam b/testing.jam
index 0e251002e..b7a2693d1 100755
--- a/testing.jam
+++ b/testing.jam
@@ -78,6 +78,7 @@ rule boost-test ( sources + : target-type : requirements * : test-name ? : defau
 local rule dump-test ( )
 {
     local srcs = [ on $(result) get-var-value source-files ] ;
+    local pwd = [ PWD ] ;
     
     # locate each source file
     local source-files ;
@@ -97,7 +98,7 @@ local rule dump-test ( )
         if $(files)
         {
             # make relative to the project root instead of "."
-            local file = $(files[1]:R=$(gINVOCATION_SUBDIR_TOKENS:J=/)) ;
+            local file = $(files[1]:R=$(pwd)) ;
             
             # try to undo absolute paths
             source-files += [ relative-path  $(file) ] ;
@@ -340,7 +341,7 @@ rule capture-run-output1 ( target : executable )
     p = $(gRUN_LD_LIBRARY_PATH($(executable))) ;
     if $(NT) 
     {
-    	RUN_LD_LIBRARY_PATH on $(target) = ;
+        RUN_LD_LIBRARY_PATH on $(target) = ;
         LD_LIBRARY_PATH_VAR on $(target) = ;
         if $(gCURRENT_TOOLSET) in $(gcc-compilers)
         {
@@ -352,7 +353,7 @@ rule capture-run-output1 ( target : executable )
     }
     else if $(p)
     {
-    	RUN_LD_LIBRARY_PATH on $(target) = $(p) $(ENV_LD_LIBRARY_PATH) ;
+        RUN_LD_LIBRARY_PATH on $(target) = $(p) $(ENV_LD_LIBRARY_PATH) ;
         LD_LIBRARY_PATH_VAR on $(target) = LD_LIBRARY_PATH ;
     }
     execute-test $(target) : $(executable) ;
diff --git a/v1/testing.jam b/v1/testing.jam
index 0e251002e..b7a2693d1 100755
--- a/v1/testing.jam
+++ b/v1/testing.jam
@@ -78,6 +78,7 @@ rule boost-test ( sources + : target-type : requirements * : test-name ? : defau
 local rule dump-test ( )
 {
     local srcs = [ on $(result) get-var-value source-files ] ;
+    local pwd = [ PWD ] ;
     
     # locate each source file
     local source-files ;
@@ -97,7 +98,7 @@ local rule dump-test ( )
         if $(files)
         {
             # make relative to the project root instead of "."
-            local file = $(files[1]:R=$(gINVOCATION_SUBDIR_TOKENS:J=/)) ;
+            local file = $(files[1]:R=$(pwd)) ;
             
             # try to undo absolute paths
             source-files += [ relative-path  $(file) ] ;
@@ -340,7 +341,7 @@ rule capture-run-output1 ( target : executable )
     p = $(gRUN_LD_LIBRARY_PATH($(executable))) ;
     if $(NT) 
     {
-    	RUN_LD_LIBRARY_PATH on $(target) = ;
+        RUN_LD_LIBRARY_PATH on $(target) = ;
         LD_LIBRARY_PATH_VAR on $(target) = ;
         if $(gCURRENT_TOOLSET) in $(gcc-compilers)
         {
@@ -352,7 +353,7 @@ rule capture-run-output1 ( target : executable )
     }
     else if $(p)
     {
-    	RUN_LD_LIBRARY_PATH on $(target) = $(p) $(ENV_LD_LIBRARY_PATH) ;
+        RUN_LD_LIBRARY_PATH on $(target) = $(p) $(ENV_LD_LIBRARY_PATH) ;
         LD_LIBRARY_PATH_VAR on $(target) = LD_LIBRARY_PATH ;
     }
     execute-test $(target) : $(executable) ;