diff options
author | Steven Knight <knight@baldmt.com> | 2002-09-07 21:07:06 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2002-09-07 21:07:06 (GMT) |
commit | 8b2cb4f6b3efbb50b06e7f368ad63267227f08e5 (patch) | |
tree | c549b9adf25622d45b5a51f7e7771838a459d2cf /test | |
parent | d2c0e3aa84d0355f592799ce260159e8c8679f88 (diff) | |
download | SCons-8b2cb4f6b3efbb50b06e7f368ad63267227f08e5.zip SCons-8b2cb4f6b3efbb50b06e7f368ad63267227f08e5.tar.gz SCons-8b2cb4f6b3efbb50b06e7f368ad63267227f08e5.tar.bz2 |
Win32 portability: Fix error status passing back when calling sys.exit().
Diffstat (limited to 'test')
-rw-r--r-- | test/nonexistent.py | 6 | ||||
-rw-r--r-- | test/option-unknown.py | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/test/nonexistent.py b/test/nonexistent.py index bacc6ce..8f2c63e 100644 --- a/test/nonexistent.py +++ b/test/nonexistent.py @@ -32,11 +32,13 @@ test = TestSCons.TestSCons() test.write('SConstruct', "") test.run(arguments = 'foo', - stderr = "scons: *** Do not know how to make target `foo'. Stop.\n") + stderr = "scons: *** Do not know how to make target `foo'. Stop.\n", + status = 2) test.run(arguments = '-k foo/bar foo', stderr = """scons: *** Do not know how to make target `foo/bar'. scons: *** Do not know how to make target `foo'. -""") +""", + status = 2) test.pass_test() diff --git a/test/option-unknown.py b/test/option-unknown.py index 68848a9..496a7e0 100644 --- a/test/option-unknown.py +++ b/test/option-unknown.py @@ -34,9 +34,17 @@ test = TestSCons.TestSCons(match = TestCmd.match_re) test.write('SConstruct', "") test.run(arguments = '-Z', - stderr = '\nSCons error: option -Z not recognized\nFile "\S+", line \d+, in short_has_arg\n') + stderr = """ +SCons error: option -Z not recognized +File "\S+", line \d+, in short_has_arg +""", + status = 2) test.run(arguments = '--ZizzerZazzerZuzz', - stderr = '\nSCons error: option --ZizzerZazzerZuzz not recognized\nFile "\S+", line \d+, in long_has_args\n') + stderr = """ +SCons error: option --ZizzerZazzerZuzz not recognized +File "\S+", line \d+, in long_has_args +""", + status = 2) test.pass_test() |