diff options
| author | Steven Knight <knight@baldmt.com> | 2010-06-05 14:03:28 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2010-06-05 14:03:28 (GMT) |
| commit | 2e4ed805ab3387ff33aac7b3d347febe39f13391 (patch) | |
| tree | 05ccf253af6e45e29281d883f897c2a31ba82048 /test | |
| parent | e8916d8480fa0b2ce55b98d692721d8fe6c514cd (diff) | |
| download | SCons-2e4ed805ab3387ff33aac7b3d347febe39f13391.zip SCons-2e4ed805ab3387ff33aac7b3d347febe39f13391.tar.gz SCons-2e4ed805ab3387ff33aac7b3d347febe39f13391.tar.bz2 | |
Fix a ripple effect from the change to TestSCons.re_escape().
Diffstat (limited to 'test')
| -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 707a7e7..3e1408f 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) |