summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRene Rivera <grafikrobot@gmail.com>2013-12-28 23:04:36 -0600
committerRene Rivera <grafikrobot@gmail.com>2013-12-28 23:04:36 -0600
commit82e2cd417cc1b7224619f7c19c6d91d48746aebc (patch)
tree039f24dc686f0e44e91c4d91614f344e0779e42a /tools
parent2aa1b26a354af35dc3327c3bd254174f8e22d6f3 (diff)
downloadboost-82e2cd417cc1b7224619f7c19c6d91d48746aebc.tar.gz
Adjust BBv2 test dir location for git layout.
Diffstat (limited to 'tools')
-rw-r--r--tools/regression/src/regression.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/regression/src/regression.py b/tools/regression/src/regression.py
index 7dd0923e66..bd0505bf1c 100644
--- a/tools/regression/src/regression.py
+++ b/tools/regression/src/regression.py
@@ -419,8 +419,11 @@ class runner:
utils.makedirs (d)
fn = os.path.join(d, "test_log.xml")
cd = os.getcwd()
- try:
- os.chdir (os.path.join (self.boost_root, 'tools/build/v2/test'));
+ try:
+ if self.use_git:
+ os.chdir (os.path.join (self.boost_root, 'tools/build/test'))
+ else:
+ os.chdir (os.path.join (self.boost_root, 'tools/build/v2/test'))
bjam_path = os.path.dirname (self.tool_path( self.bjam ))
self.log( "Using bjam binary in '%s'" % (bjam_path))
os.putenv('PATH', bjam_path + os.pathsep + os.environ['PATH'])