From 4ca82ca25f986fbeee8d4fb73da6e34dcdf6d107 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Tue, 5 Oct 2004 07:12:26 +0000 Subject: [PATCH] Remove one directory level in testcase, so stay below 8-level limit of some broken systems. [SVN r25563] --- v2/test/startup/boost-root/boost-build.jam | 2 +- v2/test/startup/boost-root/{tools => }/build/boost-build.jam | 0 v2/test/startup/boost-root/{tools => }/build/bootstrap.jam | 0 v2/test/startup/bootstrap-explicit/boost-build.jam | 2 +- v2/test/startup_v1.py | 2 +- v2/test/startup_v2.py | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename v2/test/startup/boost-root/{tools => }/build/boost-build.jam (100%) rename v2/test/startup/boost-root/{tools => }/build/bootstrap.jam (100%) diff --git a/v2/test/startup/boost-root/boost-build.jam b/v2/test/startup/boost-root/boost-build.jam index 1ff8ffced..ad718c3b0 100644 --- a/v2/test/startup/boost-root/boost-build.jam +++ b/v2/test/startup/boost-root/boost-build.jam @@ -1,2 +1,2 @@ # Emulate v1 behavior; with the boost-build file in the boost root directory. -boost-build tools/build ; +boost-build build ; diff --git a/v2/test/startup/boost-root/tools/build/boost-build.jam b/v2/test/startup/boost-root/build/boost-build.jam similarity index 100% rename from v2/test/startup/boost-root/tools/build/boost-build.jam rename to v2/test/startup/boost-root/build/boost-build.jam diff --git a/v2/test/startup/boost-root/tools/build/bootstrap.jam b/v2/test/startup/boost-root/build/bootstrap.jam similarity index 100% rename from v2/test/startup/boost-root/tools/build/bootstrap.jam rename to v2/test/startup/boost-root/build/bootstrap.jam diff --git a/v2/test/startup/bootstrap-explicit/boost-build.jam b/v2/test/startup/bootstrap-explicit/boost-build.jam index 9cfc475db..3c7be1b7b 100644 --- a/v2/test/startup/bootstrap-explicit/boost-build.jam +++ b/v2/test/startup/bootstrap-explicit/boost-build.jam @@ -1 +1 @@ -boost-build ../boost-root/tools/build ; \ No newline at end of file +boost-build ../boost-root/build ; \ No newline at end of file diff --git a/v2/test/startup_v1.py b/v2/test/startup_v1.py index 35624aaee..c6bca93db 100644 --- a/v2/test/startup_v1.py +++ b/v2/test/startup_v1.py @@ -73,7 +73,7 @@ However, it failed to call the "boost-build" rule''' # test bootstrapping based on BOOST_BUILD_PATH os.chdir('../bootstrap-env') t.run_build_system( - extra_args = '-sBOOST_ROOT=../boost-root -sBOOST_BUILD_PATH=../boost-root/tools/build' + extra_args = '-sBOOST_ROOT=../boost-root -sBOOST_BUILD_PATH=../boost-root/build' , stdout = 'build system bootstrapped' ) diff --git a/v2/test/startup_v2.py b/v2/test/startup_v2.py index c883c40fa..cdf31026a 100644 --- a/v2/test/startup_v2.py +++ b/v2/test/startup_v2.py @@ -64,7 +64,7 @@ However, it failed to call the "boost-build" rule''' # test bootstrapping based on BOOST_BUILD_PATH os.chdir('../bootstrap-env') t.run_build_system( - extra_args = '-sBOOST_BUILD_PATH=../boost-root/tools/build' + extra_args = '-sBOOST_BUILD_PATH=../boost-root/build' , stdout = 'build system bootstrapped' )