diff options
| author | Russel Winder <russel@winder.org.uk> | 2016-01-15 08:18:11 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2016-01-15 08:18:11 (GMT) |
| commit | fc44ee580c0108289037f2a284daa996b8b8060d (patch) | |
| tree | 21e877c75dc79ff5c9c1957c48b0442c3ff669fd /test/Builder/different-actions.py | |
| parent | 7af8afe47afcb33f62da6a6c452680baf7b3b73b (diff) | |
| parent | d59da7c8d278e1c37f05ce01ca1a14125295ac15 (diff) | |
| download | SCons-fc44ee580c0108289037f2a284daa996b8b8060d.zip SCons-fc44ee580c0108289037f2a284daa996b8b8060d.tar.gz SCons-fc44ee580c0108289037f2a284daa996b8b8060d.tar.bz2 | |
Merge in from default.
Diffstat (limited to 'test/Builder/different-actions.py')
| -rw-r--r-- | test/Builder/different-actions.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/Builder/different-actions.py b/test/Builder/different-actions.py index 33a1363..d84a9f9 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) |