diff options
| author | William Deegan <bill@baddogconsulting.com> | 2016-01-13 16:20:00 -0800 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2016-01-13 16:20:00 -0800 |
| commit | a024fdb166228e89c845110da3596e1275b2f995 (patch) | |
| tree | 5ccddc5470443c8183954bf99a0116184d07f6f9 /test/Builder | |
| parent | d68f763ca9edc43efb1074cf2d65768f7427f917 (diff) | |
| download | scons-a024fdb166228e89c845110da3596e1275b2f995.tar.gz | |
Fix bug 2081: Better messaging for different actions for same target in two environments
Diffstat (limited to 'test/Builder')
| -rw-r--r-- | test/Builder/different-actions.py | 2 | ||||
| -rw-r--r-- | test/Builder/multi/different-environments.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/test/Builder/different-actions.py b/test/Builder/different-actions.py index 33a1363d..d84a9f96 100644 --- a/test/Builder/different-actions.py +++ b/test/Builder/different-actions.py @@ -43,6 +43,8 @@ e2.Command('out.txt', [], 'echo 2 > $TARGET') expect = TestSCons.re_escape(""" scons: *** Two environments with different actions were specified for the same target: out.txt +(action 1: echo 1 > out.txt) +(action 2: echo 2 > out.txt) """) + TestSCons.file_expr test.run(arguments='out.txt', status=2, stderr=expect) diff --git a/test/Builder/multi/different-environments.py b/test/Builder/multi/different-environments.py index ad5154ad..68749cf8 100644 --- a/test/Builder/multi/different-environments.py +++ b/test/Builder/multi/different-environments.py @@ -57,6 +57,8 @@ test.write('file03b.in', 'file03b.in\n') expect = TestSCons.re_escape(""" scons: *** Two environments with different actions were specified for the same target: file03.out +(action 1: /usr/bin/python build.py 1 file03.out file03b.in) +(action 2: /usr/bin/python build.py 2 file03.out file03b.in) """) + TestSCons.file_expr test.run(arguments='file03.out', status=2, stderr=expect) |