summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/SConstruct.py4
-rw-r--r--test/errors.py12
2 files changed, 8 insertions, 8 deletions
diff --git a/test/SConstruct.py b/test/SConstruct.py
index 33a20ce..1c830d7 100644
--- a/test/SConstruct.py
+++ b/test/SConstruct.py
@@ -30,9 +30,9 @@ import TestSCons
test = TestSCons.TestSCons(match = TestCmd.match_re)
test.run(stdout = "",
- stderr = """
+ stderr = r"""
SCons error: No SConstruct file found.
-File "\S+Script.py", line \d+, in _main
+File "\S+", line \d+, in \S+
""")
test.match_func = TestCmd.match_exact
diff --git a/test/errors.py b/test/errors.py
index cb2248d..526ffaa 100644
--- a/test/errors.py
+++ b/test/errors.py
@@ -68,12 +68,12 @@ raise InternalError, 'error inside'
test.run(arguments='-f SConstruct3',
stdout = "other errors\n",
stderr = r"""Traceback \((most recent call|innermost) last\):
- File ".*Script.py", line \d+, in main
- _main\(\)
- File ".*Script.py", line \d+, in _main
- SCons.SConscript.SConscript\(script\)
- File ".*SConscript.py", line \d+, in SConscript
- exec file in stack\[-1\].globals
+ File ".+", line \d+, in .+
+ .+
+ File ".+", line \d+, in .+
+ .+
+ File ".+", line \d+, in .+
+ .+
File "SConstruct3", line \d+, in \?
raise InternalError, 'error inside'
InternalError: error inside