update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/boost/tools/build/test/path_features.py b/ceph/src/boost/tools/build/test/path_features.py
index f8a3f7caa99c1491876d361048cdc68f3fd2e5b2..5b23150bea28c8cbedae13c2063ea006b6937d62 100644 (file)
--- a/ceph/src/boost/tools/build/test/path_features.py
+++ b/ceph/src/boost/tools/build/test/path_features.py
@@ -96,11 +96,20 @@ int main() { return OK; }
 
 
 def test_paths_set_by_indirect_conditionals():
-    t = BoostBuild.Tester(pass_d0=False, use_test_config=False)
+    t = BoostBuild.Tester(use_test_config=False)
 
     header = "child_dir/folder_to_include/some_header.h"
 
-    t.write("jamroot.jam", "build-project child_dir ;")
+    t.write("jamroot.jam", """
+build-project child_dir ;
+rule attach-include-parent ( properties * )
+{
+    return <include>another_folder ;
+}
+# requirements inherited from a parent project will bind paths
+# relative to the project that actually names the rule.
+project : requirements <conditional>@attach-include-parent ;
+""")
     t.write("child_dir/jamfile.jam", """\
 import remote/remote ;
 
@@ -121,9 +130,11 @@ rule attach-include-remote ( properties * )
 """)
     t.write("child_dir/x.cpp", """\
 #include <some_header.h>
+#include <header2.h>
 int main() {}
 """)
     t.write(header, "int some_func();\n")
+    t.write("another_folder/header2.h", "int f2();\n")
     t.write("child_dir/folder_to_include/jamfile.jam", "")
 
     expected_x1 = "child_dir/bin/$toolset/debug*/x1.obj"
@@ -139,7 +150,7 @@ int main() {}
     t.expect_touch(expected_x2)
 
     t.touch(header)
-    t.run_build_system(["..", "-d2"], subdir="child_dir/folder_to_include")
+    t.run_build_system([".."], subdir="child_dir/folder_to_include")
     t.expect_touch(expected_x1)
     t.expect_touch(expected_x2)
 
@@ -149,4 +160,4 @@ int main() {}
 test_basic()
 test_absolute_paths()
 test_ordered_paths()
-test_paths_set_by_indirect_conditionals()
\ No newline at end of file
+test_paths_set_by_indirect_conditionals()