From 7ed82b60d8dfbbb9c5bdc8f6bd516cacd175bf6d Mon Sep 17 00:00:00 2001 From: stevenknight Date: Thu, 9 Jan 2003 07:02:06 +0000 Subject: [PATCH] Win32 portability. git-svn-id: http://scons.tigris.org/svn/scons/trunk@541 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- test/nonexistent.py | 6 ++++-- test/sconsign.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/nonexistent.py b/test/nonexistent.py index 57bf5e13..e10e1638 100644 --- a/test/nonexistent.py +++ b/test/nonexistent.py @@ -30,10 +30,13 @@ or uses a nonexistent source file. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" +import os.path import TestSCons test = TestSCons.TestSCons() +foo_bar = os.path.join('foo', 'bar') + test.write('SConstruct', """ env = Environment() env.Command("aaa.out", "aaa.in", "should never get executed") @@ -47,8 +50,7 @@ test.run(arguments = 'foo', status = 2) test.run(arguments = '-k foo/bar foo', - stderr = """scons: *** Do not know how to make target `foo/bar'. -""", + stderr = "scons: *** Do not know how to make target `%s'.\n" % foo_bar, status = 2) test.run(arguments = "aaa.out", diff --git a/test/sconsign.py b/test/sconsign.py index 3841ff56..8e78e1f9 100644 --- a/test/sconsign.py +++ b/test/sconsign.py @@ -83,11 +83,11 @@ env.B1(target = 'sub1/foo.out', source = 'foo.in') """) stderr = ''' -scons: warning: Ignoring corrupt .sconsign file: sub1..sconsign +scons: warning: Ignoring corrupt .sconsign file: sub1.\.sconsign .* ''' -stdout = test.wrap_stdout('build1\("sub1/foo.out", "foo.in"\)\n') +stdout = test.wrap_stdout('build1\("sub1.foo\.out", "foo\.in"\)\n') test.write(sub1__sconsign, 'not:a:sconsign:file') test.run(arguments = '.', stderr=stderr, stdout=stdout) -- 2.26.2