summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2003-01-09 07:02:06 (GMT)
committerSteven Knight <knight@baldmt.com>2003-01-09 07:02:06 (GMT)
commitd8971e6f3a7252356768ed9473461bfb45869e76 (patch)
tree5a5a063f31ebcee088faa846cb409b09a887a544
parent70cbd50755323e60514c354bd0b8166990a6dae7 (diff)
downloadSCons-d8971e6f3a7252356768ed9473461bfb45869e76.zip
SCons-d8971e6f3a7252356768ed9473461bfb45869e76.tar.gz
SCons-d8971e6f3a7252356768ed9473461bfb45869e76.tar.bz2
Win32 portability.
-rw-r--r--test/nonexistent.py6
-rw-r--r--test/sconsign.py4
2 files changed, 6 insertions, 4 deletions
diff --git a/test/nonexistent.py b/test/nonexistent.py
index 57bf5e1..e10e163 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 3841ff5..8e78e1f 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)