mirror of
https://github.com/boostorg/build.git
synced 2026-02-17 13:42:14 +00:00
(merge from head) Adjust to make test pass on Windows.
[SVN r35724]
This commit is contained in:
@@ -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 ;
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user