update sources to v12.2.3

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

diff --git a/ceph/src/boost/tools/build/test/searched_lib.py b/ceph/src/boost/tools/build/test/searched_lib.py
index c9ad5852d0a870ab1ca9976fd915f3fb7274318f..54c4f087889d0c515f90ac6fb9110e085144fbbc 100644 (file)
--- a/ceph/src/boost/tools/build/test/searched_lib.py
+++ b/ceph/src/boost/tools/build/test/searched_lib.py
@@ -26,17 +26,17 @@ void foo() {}
 """);
 
 t.run_build_system(subdir="lib")
-t.expect_addition("lib/bin/$toolset/debug/test_lib.dll")
+t.expect_addition("lib/bin/$toolset/debug*/test_lib.dll")
 
 
 # Auto adjusting of suffixes does not work, since we need to
 # change dll to lib.
 if ( ( os.name == "nt" ) or os.uname()[0].lower().startswith("cygwin") ) and \
     ( BoostBuild.get_toolset() != "gcc" ):
-    t.copy("lib/bin/$toolset/debug/test_lib.implib", "lib/test_lib.implib")
-    t.copy("lib/bin/$toolset/debug/test_lib.dll", "lib/test_lib.dll")
+    t.copy("lib/bin/$toolset/debug*/test_lib.implib", "lib/test_lib.implib")
+    t.copy("lib/bin/$toolset/debug*/test_lib.dll", "lib/test_lib.dll")
 else:
-    t.copy("lib/bin/$toolset/debug/test_lib.dll", "lib/test_lib.dll")
+    t.copy("lib/bin/$toolset/debug*/test_lib.dll", "lib/test_lib.dll")
 
 
 # Test that the simplest usage of searched library works.
@@ -65,8 +65,9 @@ helper() { foo(); }
 """)
 
 t.run_build_system(["-d2"])
-t.expect_addition("bin/$toolset/debug/main.exe")
+t.expect_addition("bin/$toolset/debug*/main.exe")
 t.rm("bin/$toolset/debug/main.exe")
+t.rm("bin/$toolset/debug/*/main.exe")
 
 
 # Test that 'unit-test' will correctly add runtime paths to searched libraries.
@@ -83,8 +84,9 @@ lib test_lib : : <name>test_lib <search>lib ;
 """)
 
 t.run_build_system()
-t.expect_addition("bin/$toolset/debug/main.passed")
+t.expect_addition("bin/$toolset/debug*/main.passed")
 t.rm("bin/$toolset/debug/main.exe")
+t.rm("bin/$toolset/debug/*/main.exe")
 
 
 # Now try using searched lib from static lib. Request shared version of searched
@@ -96,9 +98,10 @@ lib test_lib : : <name>test_lib <search>lib ;
 """)
 
 t.run_build_system(stderr=None)
-t.expect_addition("bin/$toolset/debug/main.exe")
-t.expect_addition("bin/$toolset/debug/link-static/helper.lib")
+t.expect_addition("bin/$toolset/debug*/main.exe")
+t.expect_addition("bin/$toolset/debug/link-static*/helper.lib")
 t.rm("bin/$toolset/debug/main.exe")
+t.rm("bin/$toolset/debug/*/main.exe")
 
 # A regression test: <library>property referring to searched-lib was being
 # mishandled. As the result, we were putting target name to the command line!