diff options
| author | Steven Knight <knight@baldmt.com> | 2010-06-05 14:03:28 +0000 |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2010-06-05 14:03:28 +0000 |
| commit | 99931e6b0e0277907b15ead2455f728642fa87c0 (patch) | |
| tree | 05ccf253af6e45e29281d883f897c2a31ba82048 /test/Builder | |
| parent | 7e966b597458118b6a74681e3fe19eed179c2ecd (diff) | |
| download | scons-99931e6b0e0277907b15ead2455f728642fa87c0.tar.gz | |
Fix a ripple effect from the change to TestSCons.re_escape().
Diffstat (limited to 'test/Builder')
| -rw-r--r-- | test/Builder/multi/same-overrides.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/Builder/multi/same-overrides.py b/test/Builder/multi/same-overrides.py index 707a7e72..3e1408f0 100644 --- a/test/Builder/multi/same-overrides.py +++ b/test/Builder/multi/same-overrides.py @@ -54,13 +54,10 @@ env.B(target = 'file4.out', source = 'file4b.in', foo=3) test.write('file4a.in', 'file4a.in\n') test.write('file4b.in', 'file4b.in\n') -python_expr = _python_.replace('\\', '\\\\') -act = TestSCons.re_escape('%s build.py \$foo \$TARGET \$SOURCES' % python_expr) - expect = (""" scons: warning: Two different environments were specified for target file4.out, -\tbut they appear to have the same action: %s -""" % act) + TestSCons.file_expr +\tbut they appear to have the same action: %s build.py .foo .TARGET .SOURCES +""" % _python_) + TestSCons.file_expr test.run(arguments='file4.out', stderr=expect) |