1 files changed, 166 insertions, 0 deletions
diff --git a/src/boost/tools/build/test/command_line_properties.py b/src/boost/tools/build/test/command_line_properties.py
new file mode 100644
index 000000000..518991b6c
--- /dev/null
+++ b/src/boost/tools/build/test/command_line_properties.py
@@ -0,0 +1,166 @@
+#!/usr/bin/python
+
+import BoostBuild
+
+def test_basic():
+    '''Tests that feature=value works'''
+    t = BoostBuild.Tester()
+    t.write('Jamroot.jam', '''
+    import feature : feature ;
+    import toolset : flags ;
+    feature f1 : 1 2 ;
+    make output.txt : : @run ;
+    flags run OPTIONS <f1> ;
+    actions run { echo $(OPTIONS) > $(<) }
+    ''')
+    t.run_build_system(['f1=2'])
+    t.expect_content("bin/*/output.txt", "2")
+    t.cleanup()
+
+def test_implicit():
+    '''Tests that implicit features can be named without a feature'''
+    t = BoostBuild.Tester()
+    t.write('Jamroot.jam', '''
+    import feature : feature ;
+    import toolset : flags ;
+    feature f1 : v1 v2 : implicit ;
+    make output.txt : : @run ;
+    flags run OPTIONS <f1> ;
+    actions run { echo $(OPTIONS) > $(<) }
+    ''')
+    t.run_build_system(['v2'])
+    t.expect_content("bin/*/output.txt", "v2")
+    t.cleanup()
+
+def test_optional():
+    '''Tests that feature= works for optional features'''
+    t = BoostBuild.Tester()
+    t.write('Jamroot.jam', '''
+    import feature : feature ;
+    import toolset : flags ;
+    feature f1 : 1 2 : optional ;
+    make output.txt : : @run ;
+    flags run OPTIONS <f1> ;
+    actions run { echo b $(OPTIONS) > $(<) }
+    ''')
+    t.run_build_system(['f1='])
+    t.expect_content("bin/*/output.txt", "b")
+    t.cleanup()
+
+def test_free():
+    '''Free features named on the command line apply to all targets
+    everywhere.  Free features can contain any characters, even those
+    that have a special meaning.'''
+    t = BoostBuild.Tester()
+    t.write('Jamroot.jam', '''
+    import feature : feature ;
+    import toolset : flags ;
+    feature f1 : : free ;
+    make output1.txt : : @run : <dependency>output2.txt ;
+    make output2.txt : : @run ;
+    explicit output2.txt ;
+    flags run OPTIONS <f1> ;
+    actions run { echo $(OPTIONS) > $(<) }
+    ''')
+    t.run_build_system(['f1=x,/:-'])
+    t.expect_content("bin*/output1.txt", "x,/:-")
+    t.expect_content("bin*/output2.txt", "x,/:-")
+    t.cleanup()
+
+def test_subfeature():
+    '''Subfeatures should be expressed as feature=value-subvalue'''
+    t = BoostBuild.Tester()
+    t.write('Jamroot.jam', '''
+    import feature : feature subfeature ;
+    import toolset : flags ;
+    feature f1 : 1 2 ;
+    subfeature f1 2 : sub : x y ;
+    make output.txt : : @run ;
+    flags run OPTIONS <f1-2:sub> ;
+    actions run { echo $(OPTIONS) > $(<) }
+    ''')
+    t.run_build_system(['f1=2-y'])
+    t.expect_content("bin/*/output.txt", "y")
+    t.cleanup()
+
+def test_multiple_values():
+    '''Multiple values of a feature can be given in a comma-separated list'''
+    t = BoostBuild.Tester()
+    t.write('Jamroot.jam', '''
+    import feature : feature ;
+    import toolset : flags ;
+    feature f1 : 1 2 3 ;
+    make output.txt : : @run ;
+    flags run OPTIONS <f1> ;
+    actions run { echo $(OPTIONS) > $(<) }
+    ''')
+    t.run_build_system(['f1=2,3'])
+    t.expect_content("bin*/f1-2*/output.txt", "2")
+    t.expect_content("bin*/f1-3*/output.txt", "3")
+    t.cleanup()
+
+def test_multiple_properties():
+    '''Multiple properties can be grouped with /'''
+    t = BoostBuild.Tester()
+    t.write('Jamroot.jam', '''
+    import feature : feature ;
+    import toolset : flags ;
+    feature f1 : 1 2 ;
+    feature f2 : 3 4 ;
+    make output.txt : : @run ;
+    flags run OPTIONS <f1> ;
+    flags run OPTIONS <f2> ;
+    actions run { echo $(OPTIONS) > $(<) }
+    ''')
+    t.run_build_system(['f1=2/f2=4'])
+    t.expect_content("bin/*/output.txt", "2 4")
+    t.cleanup()
+
+def test_cross_product():
+    '''If multiple properties are specified on the command line
+    we expand to every possible maximum set of non-conflicting features.
+    This test should be run after testing individual components in
+    isolation.'''
+    t = BoostBuild.Tester()
+    t.write('Jamroot.jam', '''
+    import feature : feature ;
+    import toolset : flags ;
+    # Make features symmetric to make the paths easier to distinguish
+    feature f1 : 11 12 13 14 15 : symmetric ;
+    feature f2 : 21 22 23 : symmetric ;
+    feature f3 : v1 v2 v3 v4 : implicit symmetric ;
+    feature f4 : : free ;
+    make output.txt : : @run ;
+    flags run OPTIONS <f1> ;
+    flags run OPTIONS <f2> ;
+    flags run OPTIONS <f3> ;
+    flags run OPTIONS <f4> ;
+    actions run { echo $(OPTIONS) > $(<) }
+    ''')
+    t.run_build_system(['f1=12,13/f2=22', 'v2', 'v3', 'f1=14', 'f2=23',
+                       'f4=xxx', 'f4=yyy', 'v4/f1=15/f4=zzz'])
+    t.expect_content("bin*/v2*/f1-12/f2-22*/output.txt", "12 22 v2 xxx yyy")
+    t.expect_addition("bin*/v2*/f1-12/f2-22*/output.txt")
+    t.expect_content("bin*/v2*/f1-13/f2-22*/output.txt", "13 22 v2 xxx yyy")
+    t.expect_addition("bin*/v2*/f1-13/f2-22*/output.txt")
+    t.expect_content("bin*/v2*/f1-14/f2-23*/output.txt", "14 23 v2 xxx yyy")
+    t.expect_addition("bin*/v2*/f1-14/f2-23*/output.txt")
+    t.expect_content("bin*/v3*/f1-12/f2-22*/output.txt", "12 22 v3 xxx yyy")
+    t.expect_addition("bin*/v3*/f1-12/f2-22*/output.txt")
+    t.expect_content("bin*/v3*/f1-13/f2-22*/output.txt", "13 22 v3 xxx yyy")
+    t.expect_addition("bin*/v3*/f1-13/f2-22*/output.txt")
+    t.expect_content("bin*/v3*/f1-14/f2-23*/output.txt", "14 23 v3 xxx yyy")
+    t.expect_addition("bin*/v3*/f1-14/f2-23*/output.txt")
+    t.expect_content("bin*/v4*/f1-15/f2-23*/output.txt", "15 23 v4 xxx yyy zzz")
+    t.expect_addition("bin*/v4*/f1-15/f2-23*/output.txt")
+    t.expect_nothing_more()
+    t.cleanup()
+
+test_basic()
+test_implicit()
+test_optional()
+test_free()
+test_subfeature()
+test_multiple_values()
+test_multiple_properties()
+test_cross_product()