Win32 portability.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@541 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/nonexistent.py b/test/nonexistent.py
index 57bf5e13c7864a6de43fa56c56e5303e5c4c8f9b..e10e1638b5a8826c02d144847a7417b9bfdad5a7 100644 (file)
--- 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 3841ff56590dcc491f7d4fff173771178933fc8d..8e78e1f987f6c43b696c5b5c7daeca8c12bdf725 100644 (file)
--- 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)