From 2e4ed805ab3387ff33aac7b3d347febe39f13391 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Sat, 5 Jun 2010 14:03:28 +0000 Subject: Fix a ripple effect from the change to TestSCons.re_escape(). --- test/Builder/multi/same-overrides.py | 7 ++----- 1 file 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) -- cgit v0.12