[SCM] build.samba.org - branch master updated

Jelmer Vernooij jelmer at samba.org
Fri Dec 3 17:52:49 MST 2010


The branch, master has been updated
       via  5588bf0 Support extracting subunit.
      from  7df6716 Add tree module.

http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5588bf0fc62ece83c8fcdcc30f920d6ca63f062b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Dec 4 01:51:57 2010 +0100

    Support extracting subunit.

-----------------------------------------------------------------------

Summary of changes:
 buildfarm/build.py |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/build.py b/buildfarm/build.py
index c708f57..a2ea904 100644
--- a/buildfarm/build.py
+++ b/buildfarm/build.py
@@ -158,11 +158,27 @@ def check_dir_exists(kind, path):
 def extract_phase_output(f):
     name = None
     output = None
+    re_action = re.compile("^ACTION (PASSED|FAILED):\s+(.*)$")
     for l in f:
+        if l.startwith("Running action "):
+            name = l[len("Running action "):].strip()
+            output = []
+            continue
+        m = re_action.match(l)
+        if m:
+            assert name == m.group(1)
+            yield name, output
+            name = None
+            output = []
+        elif output is not None:
+            output.append(l)
 
 
 def extract_test_output(f):
-    raise NotImplementedError
+    for name, output in extract_phase_output(f):
+        if name == "test":
+            return output
+    return None
 
 
 def build_status_from_logs(log, err):


-- 
build.samba.org


More information about the samba-cvs mailing list