Imported from /home/lorry/working-area/delta_boost-tarball/boost_1_58_0.tar.bz2.HEADboost_1_58_0master

3 files changed, 271 insertions, 13 deletions

diff --git a/tools/build/test/default_build.py b/tools/build/test/default_build.py
index 6ad696ef0..f6c830210 100644
--- a/tools/build/test/default_build.py
+++ b/tools/build/test/default_build.py
@@ -19,7 +19,7 @@ t.run_build_system()
 t.expect_addition("bin/$toolset/debug/a.exe")
 t.expect_addition("bin/$toolset/release/a.exe")
 
-# Check that explictly-specified build variant supresses default-build.
+# Check that explictly-specified build variant suppresses default-build.
 t.rm("bin")
 t.run_build_system(["release"])
 t.expect_addition(BoostBuild.List("bin/$toolset/release/") * "a.exe a.obj")
diff --git a/tools/build/test/link.py b/tools/build/test/link.py
index 0d63615b7..e25b70203 100755
--- a/tools/build/test/link.py
+++ b/tools/build/test/link.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright 2004 Vladimir Prus
+# Copyright 2014-2015 Steven Watanabe
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 
@@ -57,7 +57,7 @@ def test_merge_two():
     t.expect_nothing_more()
     t.cleanup()
 
-def test_merge_existing():
+def test_merge_existing(group1, group2):
     """Test adding a link when a different symlink already exists"""
     t = BoostBuild.Tester()
     t.write("jamroot.jam", """\
@@ -69,25 +69,43 @@ def test_merge_existing():
     t.write("src/dir1/include/file1.h", "file1")
     t.write("src/dir2/include/file2.h", "file2")
 
-    t.run_build_system(["dir1-link"])
+    t.run_build_system(group1)
 
-    t.expect_addition("include/file1.h")
-    t.expect_content("include/file1.h", "file1")
+    if "dir1-link" in group1:
+        t.expect_addition("include/file1.h")
+        t.expect_content("include/file1.h", "file1")
+    if "dir2-link" in group1:
+        t.expect_addition("include/file2.h")
+        t.expect_content("include/file2.h", "file2")
     ignore_config(t)
     t.expect_nothing_more()
 
-    t.run_build_system(["dir2-link"])
+    t.run_build_system(group2)
 
-    t.expect_addition("include/file2.h")
-    t.expect_content("include/file2.h", "file2")
-    # If include is a symlink to src/dir1/include, then
-    # we have to delete it and add a directory.
-    t.ignore_removal("include/file1.h")
+    if "dir1-link" in group2:
+        if "dir1-link" not in group1:
+            t.expect_addition("include/file1.h")
+        t.expect_content("include/file1.h", "file1")
+    else:
+        t.ignore_removal("include/file1.h")
+        
+    if "dir2-link" in group2:
+        if "dir2-link" not in group1:
+            t.expect_addition("include/file2.h")
+        t.expect_content("include/file2.h", "file2")
+    else:
+        t.ignore_removal("include/file2.h")
     ignore_config(t)
     t.expect_nothing_more()
 
     t.cleanup()
 
+def test_merge_existing_all():
+    test_merge_existing(["dir1-link"], ["dir2-link"])
+    test_merge_existing(["dir2-link"], ["dir1-link"])
+    test_merge_existing(["dir1-link"], ["dir1-link", "dir2-link"])
+    test_merge_existing(["dir2-link"], ["dir1-link", "dir2-link"])
+
 def test_merge_recursive():
     "Test merging several directories including common prefixes"
     t = BoostBuild.Tester()
@@ -118,6 +136,48 @@ def test_merge_recursive():
 
     t.cleanup()
 
+def test_merge_recursive_existing(group1, group2):
+    "Test merging several directories including common prefixes."
+    t = BoostBuild.Tester()
+    t.write("jamroot.jam", """\
+    import link ;
+    link-directory dir1-link : src/dir1/include : <location>. ;
+    link-directory dir2-link : src/dir2/include : <location>. ;
+    link-directory dir3-link : src/dir3/include : <location>. ;
+    link-directory dir4-link : src/dir4/include : <location>. ;
+    link-directory dir5-link : src/dir5/include : <location>. ;
+    """)
+
+    t.write("src/dir1/include/file1.h", "file1")
+    t.write("src/dir2/include/nested/file2.h", "file2")
+    t.write("src/dir3/include/nested/file3.h", "file3")
+    t.write("src/dir4/include/nested/xxx/yyy/file4.h", "file4")
+    t.write("src/dir5/include/nested/xxx/yyy/file5.h", "file5")
+
+    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")
+    ignore_config(t)
+    t.expect_nothing_more()
+
+    t.cleanup()
+
+def test_merge_recursive_existing_all():
+    # These should create a link
+    test_merge_recursive_existing(["dir2-link"], ["dir2-link", "dir1-link"])
+    test_merge_recursive_existing(["dir2-link"], ["dir1-link", "dir2-link"])
+    # These should create a directory
+    test_merge_recursive_existing(["dir2-link"], ["dir2-link", "dir3-link"])
+    test_merge_recursive_existing(["dir2-link"], ["dir3-link", "dir2-link"])
+    # It should work even if we have to create many intermediate subdirectories
+    test_merge_recursive_existing(["dir4-link"], ["dir4-link", "dir5-link"])
+    test_merge_recursive_existing(["dir4-link"], ["dir5-link", "dir4-link"])
+
 def test_include_scan():
     """Make sure that the #include scanner finds the headers"""
     t = BoostBuild.Tester()
@@ -147,8 +207,128 @@ def test_include_scan():
 
     t.cleanup()
 
+def test_include_scan_merge_existing():
+    """Make sure that files are replaced if needed when merging in
+    a new directory"""
+    t = BoostBuild.Tester()
+
+    t.write("jamroot.jam", """\
+    import link ;
+    link-directory dir1-link : src/dir1/include : <location>. ;
+    link-directory dir2-link : src/dir2/include : <location>. ;
+    obj test : test.cpp :
+        <include>include
+        <implicit-dependency>dir1-link
+        <implicit-dependency>dir2-link ;
+    """)
+
+    t.write("src/dir1/include/file1.h", "int f();")
+    t.write("src/dir2/include/file2.h", "#include <file1.h>")
+    t.write("test.cpp", """\
+    #include <file2.h>
+    int main() { f(); }
+    """)
+
+    t.run_build_system(["dir2-link"])
+
+    t.run_build_system(["test"])
+    t.expect_addition("include/file1.h")
+    t.expect_addition("bin/$toolset/debug/test.obj")
+    t.expect_nothing_more()
+
+    t.cleanup()
+
+def test_update_file_link(params1, params2):
+    """Tests the behavior of updates when changing the link mode.
+    The link needs to be updated iff the original was a copy."""
+    t = BoostBuild.Tester()
+
+    t.write("jamroot.jam", """\
+    import link ;
+    import project ;
+    import property-set ;
+    import modules ;
+
+    if --no-symlinks in [ modules.peek : ARGV ]
+    {
+        modules.poke link : .can-symlink : false ;
+    }
+
+    if --no-hardlinks in [ modules.peek : ARGV ]
+    {
+        modules.poke link : .can-hardlink : false ;
+    }
+
+    .project = [ project.current ] ;
+    .has-files = [ glob include/file1.h ] ;
+    
+    rule can-link ( properties * ) {
+        if ( ! [ link.can-symlink $(.project) : [ property-set.empty ] ] ) &&
+           ( ! [ link.can-hardlink $(.project) : [ property-set.empty ] ] )
+        {
+            ECHO links unsupported ;
+        }
+    }
+
+    # Use two directories so that we link to individual files.
+    link-directory dir1-link : src/dir1/include : <location>. ;
+    link-directory dir2-link : src/dir2/include : <location>. ;
+    alias check-linking : : <conditional>@can-link ;
+    """)
+    t.write("src/dir1/include/file1.h", "file1")
+    t.write("src/dir2/include/file2.h", "file2")
+
+    t.run_build_system(params1)
+    ignore_config(t)
+    t.expect_addition("include/file1.h")
+    t.expect_addition("include/file2.h")
+    t.expect_nothing_more()
+
+    using_links = "links unsupported" not in t.stdout()
+
+    t.touch("src/dir1/include/file1.h")
+
+    t.run_build_system(params2)
+    if not using_links: t.expect_touch("include/file1.h")
+    ignore_config(t)
+    t.expect_nothing_more()
+
+    t.cleanup()
+
+def test_update_file_link_all():
+    """Test all nine possible combinations of two runs."""
+    possible_args = [[], ["--no-symlinks"], ["--no-symlinks", "--no-hardlinks"]]
+    for arg1 in possible_args:
+        for arg2 in possible_args:
+            test_update_file_link(arg1, arg2)
+
+def test_error_duplicate():
+    """Test that linking a single file from
+    multiple sources causes a hard error."""
+    t = BoostBuild.Tester()
+
+    t.write("jamroot.jam", """\
+    import link ;
+    link-directory dir1-link : src/dir1/include : <location>. ;
+    link-directory dir2-link : src/dir2/include : <location>. ;
+    """)
+
+    t.write("src/dir1/include/file1.h", "file1")
+    t.write("src/dir2/include/file1.h", "file2")
+
+    t.run_build_system(status=1)
+    t.expect_output_lines(
+        ["error: Cannot create link include/file1.h to src/dir2/include/file1.h.",
+         "error: Link previously defined to another file, src/dir1/include/file1.h."])
+
+    t.cleanup()
+
 test_basic()
 test_merge_two()
-test_merge_existing()
+test_merge_existing_all()
 test_merge_recursive()
+test_merge_recursive_existing_all()
 test_include_scan()
+test_include_scan_merge_existing()
+test_update_file_link_all()
+test_error_duplicate()
diff --git a/tools/build/test/ordered_include.py b/tools/build/test/ordered_include.py
index 2ce955c0d..f91f81fe8 100644
--- a/tools/build/test/ordered_include.py
+++ b/tools/build/test/ordered_include.py
@@ -8,6 +8,82 @@
 
 import BoostBuild
 
+def test_default_order():
+    tester = BoostBuild.Tester(use_test_config=False)
+    tester.write("jamroot.jam", """
+
+    import order ;
+    import "class" : new ;
+
+    obj test : test.cpp : <include>b <include>a ;
+    """)
+
+    tester.write("test.cpp", """
+    #include <test.hpp>
+    int main() { f(); }
+    """)
+    
+    tester.write("a/test.hpp", """
+    void f();
+    """)
+    
+    tester.write("b/test.hpp", """
+    """)
+    
+    tester.run_build_system()
+    
+    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_nothing_more()
+    
+    tester.touch("b/test.hpp")
+    tester.run_build_system()
+    tester.expect_nothing_more()
+
+    tester.cleanup()
+
+def test_default_order_mixed():
+    tester = BoostBuild.Tester(use_test_config=False)
+    tester.write("jamroot.jam", """
+
+    import order ;
+    import "class" : new ;
+
+    obj test : test.cpp : <include>b <include>a <include>c&&d ;
+    """)
+
+    tester.write("test.cpp", """
+    #include <test.hpp>
+    int main() { f(); }
+    """)
+    
+    tester.write("a/test.hpp", """
+    void f();
+    """)
+    
+    tester.write("b/test.hpp", """
+    """)
+    
+    tester.run_build_system()
+    
+    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_nothing_more()
+    
+    tester.touch("b/test.hpp")
+    tester.run_build_system()
+    tester.expect_nothing_more()
+
+    tester.cleanup()
+
 def test_basic():
     tester = BoostBuild.Tester(use_test_config=False)
     tester.write("jamroot.jam", """
@@ -167,6 +243,8 @@ def test_order_graph():
 
     t.cleanup()
 
+test_default_order()
+test_default_order_mixed()
 test_basic()
 test_order1()
 test_order2()