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.

1 files changed, 7 insertions, 6 deletions

diff --git a/QMTest/TestCommon.py b/QMTest/TestCommon.py
index 8a3ad37..167f84d 100644
--- a/QMTest/TestCommon.py
+++ b/QMTest/TestCommon.py
@@ -220,12 +220,13 @@ if os.name == 'posix':
             return None
         return _status(self) != status
     def _status(self):
-        if os.WIFEXITED(self.status):
-            return os.WEXITSTATUS(self.status)
-        elif os.WIFSIGNALED(self.status):
-            return os.WTERMSIG(self.status)
-        else:
-            return None
+        return self.status      # p.wait() has already retrieved the OS status from the status val; don't do it again here!
+#         if os.WIFEXITED(self.status):
+#             return os.WEXITSTATUS(self.status)
+#         elif os.WIFSIGNALED(self.status):
+#             return os.WTERMSIG(self.status)
+#         else:
+#             return None
 elif os.name == 'nt':
     def _failed(self, status = 0):
         return not (self.status is None or status is None) and \