X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Ftools%2Fbuild%2Ftest%2Fordered_include.py;h=ef1d8745d693f17fd59acae8c93798403f809ed8;hb=b32b81446b3b05102be0267e79203f59329c1d97;hp=72ab0d3d75611e4d41cca4ca76e33148e01414ba;hpb=215dd7151453fae88e6f968c975b6ce309d42dcf;p=ceph.git

diff --git a/ceph/src/boost/tools/build/test/ordered_include.py b/ceph/src/boost/tools/build/test/ordered_include.py
index 72ab0d3d7..ef1d8745d 100644
--- a/ceph/src/boost/tools/build/test/ordered_include.py
+++ b/ceph/src/boost/tools/build/test/ordered_include.py
@@ -32,12 +32,12 @@ def test_default_order():
     
     tester.run_build_system()
     
-    tester.expect_addition("bin/$toolset/debug/test.obj")
+    tester.expect_addition("bin/$toolset/debug*/test.obj")
     
     # Check that the dependencies are correct
     tester.touch("a/test.hpp")
     tester.run_build_system()
-    tester.expect_touch("bin/$toolset/debug/test.obj")
+    tester.expect_touch("bin/$toolset/debug*/test.obj")
     tester.expect_nothing_more()
     
     tester.touch("b/test.hpp")
@@ -70,12 +70,12 @@ def test_default_order_mixed():
     
     tester.run_build_system()
     
-    tester.expect_addition("bin/$toolset/debug/test.obj")
+    tester.expect_addition("bin/$toolset/debug*/test.obj")
     
     # Check that the dependencies are correct
     tester.touch("a/test.hpp")
     tester.run_build_system()
-    tester.expect_touch("bin/$toolset/debug/test.obj")
+    tester.expect_touch("bin/$toolset/debug*/test.obj")
     tester.expect_nothing_more()
     
     tester.touch("b/test.hpp")
@@ -104,16 +104,16 @@ def test_basic():
 
     tester.run_build_system()
 
-    tester.expect_addition("bin/$toolset/debug/test.obj")
+    tester.expect_addition("bin/$toolset/debug*/test.obj")
 
     # Check that the dependencies are correct
     tester.touch("a/test1.hpp")
     tester.run_build_system()
-    tester.expect_touch("bin/$toolset/debug/test.obj")
+    tester.expect_touch("bin/$toolset/debug*/test.obj")
 
     tester.touch("b/test2.hpp")
     tester.run_build_system()
-    tester.expect_touch("bin/$toolset/debug/test.obj")
+    tester.expect_touch("bin/$toolset/debug*/test.obj")
 
     tester.cleanup()
 
@@ -135,7 +135,7 @@ def test_order1():
 
     t.touch("a/test.h")
     t.run_build_system()
-    t.expect_touch("bin/$toolset/debug/test.obj")
+    t.expect_touch("bin/$toolset/debug*/test.obj")
     t.expect_nothing_more()
 
     t.touch("b/test.h")
@@ -166,7 +166,7 @@ def test_order2():
 
     t.touch("b/test.h")
     t.run_build_system()
-    t.expect_touch("bin/$toolset/debug/test.obj")
+    t.expect_touch("bin/$toolset/debug*/test.obj")
     t.expect_nothing_more()
 
     t.cleanup()
@@ -203,11 +203,11 @@ def test_order_graph():
     t.write("d/test4.h", "#error should find b/test4.h\n")
 
     t.run_build_system()
-    t.expect_addition("bin/$toolset/debug/test.obj")
+    t.expect_addition("bin/$toolset/debug*/test.obj")
 
     t.touch("b/test1.h")
     t.run_build_system()
-    t.expect_touch("bin/$toolset/debug/test.obj")
+    t.expect_touch("bin/$toolset/debug*/test.obj")
     t.expect_nothing_more()
 
     t.touch("a/test1.h")
@@ -216,7 +216,7 @@ def test_order_graph():
 
     t.touch("c/test2.h")
     t.run_build_system()
-    t.expect_touch("bin/$toolset/debug/test.obj")
+    t.expect_touch("bin/$toolset/debug*/test.obj")
     t.expect_nothing_more()
 
     t.touch("b/test2.h")
@@ -225,7 +225,7 @@ def test_order_graph():
 
     t.touch("e/test3.h")
     t.run_build_system()
-    t.expect_touch("bin/$toolset/debug/test.obj")
+    t.expect_touch("bin/$toolset/debug*/test.obj")
     t.expect_nothing_more()
 
     t.touch("b/test3.h")
@@ -234,7 +234,7 @@ def test_order_graph():
 
     t.touch("b/test4.h")
     t.run_build_system()
-    t.expect_touch("bin/$toolset/debug/test.obj")
+    t.expect_touch("bin/$toolset/debug*/test.obj")
     t.expect_nothing_more()
 
     t.touch("d/test4.h")