summaryrefslogtreecommitdiffstats
path: root/test/Parallel
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2008-10-29 03:01:00 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2008-10-29 03:01:00 (GMT)
commit652d80b36bf9e80989336bf7a25b54c176ff626c (patch)
tree93f780a267396d95f9bfeba9c48da963a81abf05 /test/Parallel
parentd695652a34c6740b3c925a94b45256270027f473 (diff)
downloadSCons-652d80b36bf9e80989336bf7a25b54c176ff626c.zip
SCons-652d80b36bf9e80989336bf7a25b54c176ff626c.tar.gz
SCons-652d80b36bf9e80989336bf7a25b54c176ff626c.tar.bz2
Applied Benoit Belley's patch in ticket 1957 improve the robustness of
GetBuildFailures(). New function convert_to_buildError, and use it in several places so all build failures now go through it and are returned as BuildError exceptions. Had a small effect on output formatting in many tests but no significant change to behavior. I reworked the patch a little to keep SCons exit status values the same as before; this patch could make it simpler to change them in some cases, e.g. exit with the errno of the failed action if desired. One nice side effect of this patch is that more scons errors print the node that caused the error now.
Diffstat (limited to 'test/Parallel')
-rw-r--r--test/Parallel/multiple-parents.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/Parallel/multiple-parents.py b/test/Parallel/multiple-parents.py
index d9c414f..cfcad73 100644
--- a/test/Parallel/multiple-parents.py
+++ b/test/Parallel/multiple-parents.py
@@ -143,7 +143,7 @@ Default(all)
re_error = """\
(scons: \\*\\*\\* \\[failed\\d+] Error 2\\n)|\
-(scons: \\*\\*\\* Source `MissingSrc' not found, needed by target `missing\\d+'\\.( Stop\\.)?\\n)|\
+(scons: \\*\\*\\* \\[missing\\d+] Source `MissingSrc' not found, needed by target `missing\\d+'\\.( Stop\\.)?\\n)|\
(scons: \\*\\*\\* \\[\\w+] Build interrupted\.\\n)\
"""