Display more clearly when make test returns an error with no failed tests
authorMatthieu Patou <mat@matws.net>
Mon, 8 Nov 2010 06:57:57 +0000 (09:57 +0300)
committerMatthieu Patou <mat@matws.net>
Mon, 8 Nov 2010 21:10:55 +0000 (00:10 +0300)
buildfarm/data.py
web/build.py

index a13b5269937c96ea026f4c1273a5e7f2cad251d4..d5e936a5afad62ccc79ceb17145ebaa8fb5e910a 100644 (file)
@@ -49,6 +49,7 @@ def check_dir_exists(kind, path):
 def build_status_from_logs(log, err):
     """get status of build"""
     m = re.search("TEST STATUS:(\s*\d+)", log)
+    other_failures = set()
     if m:
         tstatus = int(m.group(1).strip())
     else:
@@ -62,6 +63,7 @@ def build_status_from_logs(log, err):
                 tstatus = 255
             if m.group(1) == "FAILED" and tstatus == 0:
                 tstatus = -1
+                other_failures.add("make test error")
         else:
             tstatus = None
 
@@ -83,7 +85,6 @@ def build_status_from_logs(log, err):
     else:
         cstatus = None
 
-    other_failures = set()
     m = re.search("(PANIC|INTERNAL ERROR):.*", log)
     if m:
         other_failures.add("panic")
index 590ab385299e999f05197e93cfd2aac5ee7a54fd..231543655bcb7e3269a5f735a9393a06103bffd3 100755 (executable)
@@ -106,6 +106,8 @@ def html_build_status(status):
         ostatus += "/"+span("status failed", "disk full")
     if "timeout" in status.other_failures:
         ostatus += "/"+span("status failed", "timeout")
+    if "make test error" in status.other_failures:
+        ostatus += "/"+span("status failed", "unexpected return code")
     bstatus = "/".join([span_status(s) for s in status.stages])
     return bstatus + ostatus