From 2bf1779f956bcd45da72daedfbc557b434bcce2b Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Mon, 6 May 2002 18:54:24 +0000
Subject: [PATCH] Bug fixes

[SVN r13693]
---
 src/engine/Jambase    | 2 +-
 src/engine/jambase.c  | 2 +-
 test/BoostBuild.py    | 9 ++++++---
 test/project_test1.py | 2 +-
 test/startup_v1.py    | 1 +
 test/startup_v2.py    | 1 +
 test/test_all.py      | 4 +---
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/engine/Jambase b/src/engine/Jambase
index 3ec67beb9..7e5944f3b 100644
--- a/src/engine/Jambase
+++ b/src/engine/Jambase
@@ -103,7 +103,7 @@ if [ MATCH .*(bjam).* : $(ARGV[1]:BL) ]
     local boost-build-files =
         [ find-to-root [ PWD ] : boost-build.jam ]
         # Another temporary measure so Jam works with Boost.Build v1
-        [ GLOB $(BOOST_ROOT) : boost-build.jam ] ;
+        [ GLOB $(BOOST_BUILD_PATH) $(BOOST_ROOT) : boost-build.jam ] ;
     
     .boost-build-file = $(boost-build-files[1]) ;
     
diff --git a/src/engine/jambase.c b/src/engine/jambase.c
index 6490f9ab6..f71321036 100644
--- a/src/engine/jambase.c
+++ b/src/engine/jambase.c
@@ -53,7 +53,7 @@ char *jambase[] = {
 "{\n",
 "local boost-build-files =\n",
 "[ find-to-root [ PWD ] : boost-build.jam ]\n",
-"[ GLOB $(BOOST_ROOT) : boost-build.jam ] ;\n",
+"[ GLOB $(BOOST_BUILD_PATH) $(BOOST_ROOT) : boost-build.jam ] ;\n",
 ".boost-build-file = $(boost-build-files[1]) ;\n",
 "if ! $(.boost-build-file)\n",
 "{\n",
diff --git a/test/BoostBuild.py b/test/BoostBuild.py
index 75799aefe..ff1c22cee 100644
--- a/test/BoostBuild.py
+++ b/test/BoostBuild.py
@@ -38,7 +38,8 @@ class Tester(TestCmd.TestCmd):
     executable to invoke. Set this to "jam" to test Boost.Build v1
     behavior.
     """
-    def __init__(self, arguments="", executable = 'bjam', match = TestCmd.match_exact):
+    def __init__(self, arguments="", executable = 'bjam', match =
+                 TestCmd.match_exact, boost_build_path = None):
 
         self.original_workdir = os.getcwd()
 
@@ -50,12 +51,14 @@ class Tester(TestCmd.TestCmd):
         else:
             raise "Don't know directory where jam is build for this system"
 
+        if boost_build_path is None:
+            boost_build_path = os.path.join(self.original_workdir, "..", "new")
+            
         TestCmd.TestCmd.__init__(
             self
             , program=os.path.join(
                 '..', 'jam_src', jam_build_dir, executable)
-#              + ' -sBOOST_BUILD_PATH='
-#              + os.path.join(self.original_workdir, "..", "new")
+              +  ' -sBOOST_BUILD_PATH=' + boost_build_path
               + ' -d0 --debug --quiet'
               + ' ' + arguments
             , match=match
diff --git a/test/project_test1.py b/test/project_test1.py
index 0128237bb..98e47533e 100644
--- a/test/project_test1.py
+++ b/test/project_test1.py
@@ -3,7 +3,7 @@
 from BoostBuild import Tester
 import os
 
-t = Tester("--build-system=project-test1")
+t = Tester("--build-system=project-test1", boost_build_path='')
 
 # This test does no modifications, so run in in the invocation dir
 
diff --git a/test/startup_v1.py b/test/startup_v1.py
index 51206c884..8c1af85c6 100644
--- a/test/startup_v1.py
+++ b/test/startup_v1.py
@@ -14,6 +14,7 @@ def match_re(actual,expected):
 t = Tester(
     executable='jam'
     , match=match_re
+    , boost_build_path=''
     )
 
 t.set_tree('startup')
diff --git a/test/startup_v2.py b/test/startup_v2.py
index db691208e..e1acbc93d 100644
--- a/test/startup_v2.py
+++ b/test/startup_v2.py
@@ -10,6 +10,7 @@ def match_re(actual,expected):
 # Test the v1 startup behavior
 t = Tester(
     match= match_re
+    , boost_build_path=''
     )
 
 t.set_tree('startup')
diff --git a/test/test_all.py b/test/test_all.py
index f689d178e..25520f139 100644
--- a/test/test_all.py
+++ b/test/test_all.py
@@ -2,6 +2,4 @@
 import startup_v1
 import startup_v2
 import project_test1
-
-# Not sure why, but this one isn't working yet
-# import project_test2
+import project_test2