update sources to v12.2.3

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

diff --git a/ceph/src/boost/tools/build/test/link.py b/ceph/src/boost/tools/build/test/link.py
index e25b702035bf7160807f9ce163633432d07bb6ec..4f83e1b09ae8cfdf2bd8e5acb920048802b8f33d 100755 (executable)
--- a/ceph/src/boost/tools/build/test/link.py
+++ b/ceph/src/boost/tools/build/test/link.py
@@ -85,6 +85,12 @@ def test_merge_existing(group1, group2):
     if "dir1-link" in group2:
         if "dir1-link" not in group1:
             t.expect_addition("include/file1.h")
+        else:
+            # When a directory is split the link needs to be recreated.
+            # On Windows, the test system checks the mod time of the
+            # link rather than the link target, so this may be seen as
+            # an update.
+            t.ignore_touch("include/file1.h")
         t.expect_content("include/file1.h", "file1")
     else:
         t.ignore_removal("include/file1.h")
@@ -92,6 +98,8 @@ def test_merge_existing(group1, group2):
     if "dir2-link" in group2:
         if "dir2-link" not in group1:
             t.expect_addition("include/file2.h")
+        else:
+            t.ignore_touch("include/file2.h")
         t.expect_content("include/file2.h", "file2")
     else:
         t.ignore_removal("include/file2.h")
@@ -157,11 +165,18 @@ def test_merge_recursive_existing(group1, group2):
     t.run_build_system(group1)
     t.run_build_system(group2 + ["-d+12"])
 
-    t.ignore_addition("include/file1.h")
-    t.ignore_addition("include/nested/file2.h")
-    t.ignore_addition("include/nested/file3.h")
-    t.ignore_addition("include/nested/xxx/yyy/file4.h")
-    t.ignore_addition("include/nested/xxx/yyy/file5.h")
+    def check_file(target, file):
+        if target in group2:
+            if target in group1:
+                t.ignore_touch(file)
+            else:
+                t.expect_addition(file)
+
+    check_file("dir1-link", "include/file1.h")
+    check_file("dir2-link", "include/nested/file2.h")
+    check_file("dir3-link", "include/nested/file3.h")
+    check_file("dir4-link", "include/nested/xxx/yyy/file4.h")
+    check_file("dir5-link", "include/nested/xxx/yyy/file5.h")
     ignore_config(t)
     t.expect_nothing_more()
 
@@ -200,7 +215,7 @@ def test_include_scan():
 
     t.run_build_system(["test"])
 
-    t.expect_addition("bin/$toolset/debug/test.obj")
+    t.expect_addition("bin/$toolset/debug*/test.obj")
 
     t.run_build_system()
     t.expect_nothing_more()
@@ -233,7 +248,8 @@ def test_include_scan_merge_existing():
 
     t.run_build_system(["test"])
     t.expect_addition("include/file1.h")
-    t.expect_addition("bin/$toolset/debug/test.obj")
+    t.expect_addition("bin/$toolset/debug*/test.obj")
+    t.ignore_touch("include/file2.h")
     t.expect_nothing_more()
 
     t.cleanup()