diff options
author | Steven Knight <knight@baldmt.com> | 2004-11-11 11:42:53 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2004-11-11 11:42:53 (GMT) |
commit | 660b88bdece9aca1016b16f11b78663c9a57a822 (patch) | |
tree | 4fef983676358f4f0a553fed0e037760f058ebe1 /test/errors.py | |
parent | d74794f92c9d9cdbf0e4b4c07a9b303bdb02fe66 (diff) | |
download | SCons-660b88bdece9aca1016b16f11b78663c9a57a822.zip SCons-660b88bdece9aca1016b16f11b78663c9a57a822.tar.gz SCons-660b88bdece9aca1016b16f11b78663c9a57a822.tar.bz2 |
Handle moved SCons source tree. (Kevin Quick)
Diffstat (limited to 'test/errors.py')
-rw-r--r-- | test/errors.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/test/errors.py b/test/errors.py index 1652f88..571bffc 100644 --- a/test/errors.py +++ b/test/errors.py @@ -56,15 +56,18 @@ env.foo('foo.out', 'foo.in') env.exit('exit.out', 'exit.in') """) +# print_exception doesn't always show a source line if the source file +# no longer exists or that line in the source file no longer exists, +# so make sure the proper variations are supported in the following +# regexp. stderr = """scons: \*\*\* \[exit.out\] Exception Traceback \((most recent call|innermost) last\): - File ".+", line \d+, in \S+ +( File ".+", line \d+, in \S+ [^\n]+ - File ".+", line \d+, in \S+ +)*( File ".+", line \d+, in \S+ +)*( File ".+", line \d+, in \S+ [^\n]+ - File ".+", line \d+, in \S+ - [^\n]+ -\S.+ +)*\S.+ """ test.run(arguments='foo.out exit.out', stderr=stderr, status=2) |