From 690335e9b19a2832ea989d3be243fc74c60b8af2 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Mon, 4 Jul 2011 09:10:38 +0000 Subject: [PATCH] Merge "Unbreak Boost.Build tests" See https://svn.boost.org/trac/boost/changeset/72883 Authorized by Beman. [SVN r72884] --- v2/test/BoostBuild.py | 4 ++-- v2/test/unit_tests.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2/test/BoostBuild.py b/v2/test/BoostBuild.py index 7c01b6102..409a51b6e 100644 --- a/v2/test/BoostBuild.py +++ b/v2/test/BoostBuild.py @@ -247,8 +247,8 @@ class Tester(TestCmd.TestCmd): # Find where jam_src is located. Try for the debug version if it is # lying around. - dirs = [os.path.join('../engine/src', jam_build_dir + '.debug'), - os.path.join('../engine/src', jam_build_dir), + dirs = [os.path.join('../engine', jam_build_dir + '.debug'), + os.path.join('../engine', jam_build_dir), ] for d in dirs: if os.path.exists(d): diff --git a/v2/test/unit_tests.py b/v2/test/unit_tests.py index b2cac4bd5..f306a9057 100644 --- a/v2/test/unit_tests.py +++ b/v2/test/unit_tests.py @@ -8,6 +8,6 @@ import BoostBuild t = BoostBuild.Tester(pass_toolset=0) -t.run_build_system(extra_args="--debug --build-system=test") +t.run_build_system(extra_args="--debug --build-system=test/test") t.cleanup()