From 9b8ccfaa89dc6ac713b12a326780586143f1ad31 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Thu, 16 Apr 2009 15:41:23 +0000 Subject: Win32 fixes: update error message, accomodate re match. --- test/Win32/bad-drive.py | 4 ++-- test/nonexistent.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/Win32/bad-drive.py b/test/Win32/bad-drive.py index 513f7fa..200ae02 100644 --- a/test/Win32/bad-drive.py +++ b/test/Win32/bad-drive.py @@ -86,13 +86,13 @@ test.run(arguments = 'aaa.out') test.fail_test(test.read('aaa.out') != "aaa.in\n") # This next test used to provide a slightly different error message: -# "scons: *** Do not know how to make target `%snot_mentioned'. Stop.\n" +# "scons: *** Do not know how to make File target `%snot_mentioned'. Stop.\n" # Right now, it doesn't seem important enough to track down exactly # why this changed and fix it, but we'll preserve it here in case it # becomes an issue or some refactoring restores the old behavior. test.run(arguments = bad_drive + 'not_mentioned', - stderr = "scons: *** Do not know how to make target `%snot_mentioned'. Stop.\n" % (bad_drive), + stderr = "scons: *** Do not know how to make File target `%snot_mentioned'. Stop.\n" % (bad_drive), status = 2) expect = "scons: *** [%sno_target_1] No drive `%s' for target `%sno_target_1'.\n" % (bad_drive, bad_drive, bad_drive) diff --git a/test/nonexistent.py b/test/nonexistent.py index 770f3b7..4a4bd6d 100644 --- a/test/nonexistent.py +++ b/test/nonexistent.py @@ -31,6 +31,8 @@ or uses a nonexistent source file. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path +import re + import TestSCons test = TestSCons.TestSCons() @@ -51,7 +53,7 @@ test.run(arguments = 'foo', match=TestSCons.match_re_dotall) test.run(arguments = '-k foo/bar foo', - stderr = "scons: \\*\\*\\* Do not know how to make File target `%s' \\(.*foo.bar\\).\n" % foo_bar, + stderr = "scons: \\*\\*\\* Do not know how to make File target `%s' \\(.*foo.bar\\).\n" % re.escape(foo_bar), status = 2, match=TestSCons.match_re_dotall) -- cgit v0.12