import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / tools / build / test / startup_v2.py

diff --git a/ceph/src/boost/tools/build/test/startup_v2.py b/ceph/src/boost/tools/build/test/startup_v2.py
index ae7d0da4095b86c17fd2f6a3c838d09ceb96e101..d84948eebe100340b1d856d18d04f16b54599bd5 100644 (file)
--- a/ceph/src/boost/tools/build/test/startup_v2.py
+++ b/ceph/src/boost/tools/build/test/startup_v2.py
@@ -54,34 +54,36 @@ t = BoostBuild.Tester(match=match_re, boost_build_path="", pass_toolset=0)
 t.set_tree("startup")
 check_for_existing_boost_build_jam(t)
 
-t.run_build_system(status=1, stdout=
-r"""Unable to load B2: could not find "boost-build\.jam"
-.*Attempted search from .* up to the root""")
+t.run_build_system(status=1, stderr=
+r"""Unable to load B2: could not find 'boost-build\.jam'
+.*Attempted search from .* up to the root at '.*'""")
 
 t.run_build_system(status=1, subdir="no-bootstrap1",
-    stdout=r"Unable to load B2: could not find build system\."
-    r".*attempted to load the build system by invoking"
-    r".*'boost-build ;'"
-    r'.*but we were unable to find "bootstrap\.jam"')
+    stderr=
+r"""Unable to load B2: could not find build system\.
+-----------------------------------------------
+.*attempted to load the build system by invoking
+.*'boost-build  ;'
+.*but we were unable to find 'bootstrap\.jam' in the specified directory or in BOOST_BUILD_PATH:""")
 
 # Descend to a subdirectory which /does not/ contain a boost-build.jam file,
 # and try again to test the crawl-up behavior.
 t.run_build_system(status=1, subdir=os.path.join("no-bootstrap1", "subdir"),
-    stdout=r"Unable to load B2: could not find build system\."
+    stderr=r"Unable to load B2: could not find build system\."
     r".*attempted to load the build system by invoking"
-    r".*'boost-build ;'"
-    r'.*but we were unable to find "bootstrap\.jam"')
+    r".*'boost-build  ;'"
+    r".*but we were unable to find 'bootstrap\.jam' in the specified directory or in BOOST_BUILD_PATH:")
 
 t.run_build_system(status=1, subdir="no-bootstrap2",
-    stdout=r"Unable to load B2: could not find build system\."
+    stderr=r"Unable to load B2: could not find build system\."
     r".*attempted to load the build system by invoking"
     r".*'boost-build \. ;'"
-    r'.*but we were unable to find "bootstrap\.jam"')
+    r".*but we were unable to find 'bootstrap\.jam' in the specified directory or in BOOST_BUILD_PATH:")
 
-t.run_build_system(status=1, subdir='no-bootstrap3', stdout=
+t.run_build_system(status=1, subdir='no-bootstrap3', stderr=
 r"""Unable to load B2
-.*boost-build\.jam" was found.*
-However, it failed to call the "boost-build" rule""")
+.*boost-build\.jam' was found.*
+However, it failed to call the 'boost-build' rule to indicate the location of the build system.""")
 
 # Test bootstrapping based on BOOST_BUILD_PATH.
 t.run_build_system(["-sBOOST_BUILD_PATH=../boost-root/build"],