diff --git a/v2/test/module-actions/bootstrap.jam b/v2/test/module-actions/bootstrap.jam index b2b752d06..ff52a60d3 100644 --- a/v2/test/module-actions/bootstrap.jam +++ b/v2/test/module-actions/bootstrap.jam @@ -39,10 +39,7 @@ module A ALWAYS $(target) ; } - actions act - { - echo A.act $(<): $(X1) $(X2) $(X3) - } + actions act { echo A.act $(<): $(X1) $(X2) $(X3) } make t1 : : A.act ; make t2 : : A.act ; @@ -53,20 +50,14 @@ module B { X2 = X2-B ; - actions act - { - echo B.act $(<): $(X1) $(X2) $(X3) - } + actions act { echo B.act $(<): $(X1) $(X2) $(X3) } make t1 : : B.act ; make t2 : : B.act ; make t3 : : B.act ; } -actions act -{ - echo act $(<): $(X1) $(X2) $(X3) -} +actions act { echo act $(<): $(X1) $(X2) $(X3) } make t1 : : act ; make t2 : : act ; diff --git a/v2/test/module_actions.py b/v2/test/module_actions.py index 93e6d1ccd..f0c4315f8 100644 --- a/v2/test/module_actions.py +++ b/v2/test/module_actions.py @@ -11,15 +11,15 @@ t = Tester(pass_toolset=0) t.set_tree('module-actions') -expected = r'''A.act t1: X1-t1 -B.act t1: X1-t1 X2-B -act t1: X1-t1 X2-global X3-global -A.act t2: X1-A X2-t2 -B.act t2: X2-t2 -act t2: X1-global X2-t2 X3-global -A.act t3: X1-A X3-t3 -B.act t3: X2-B X3-t3 -act t3: X1-global X2-global X3-t3 +expected = r'''A.act t1: X1-t1 +B.act t1: X1-t1 X2-B +act t1: X1-t1 X2-global X3-global +A.act t2: X1-A X2-t2 +B.act t2: X2-t2 +act t2: X1-global X2-t2 X3-global +A.act t3: X1-A X3-t3 +B.act t3: X2-B X3-t3 +act t3: X1-global X2-global X3-t3 ''' # On Unixes, call to 'echo 1 2 3' produces '1 2 3' (note spacing)