octave-buildbot: master.cfg comparison

comparison master.cfg @ 1:97e7b7963dc9

make test log filtering work again

author	John W. Eaton <jwe@octave.org>
date	Tue, 12 Jun 2018 21:14:47 +0000
parents	4ad92f00bca5
children	f77e7e92cc95

comparison

equal deleted inserted replaced

-:4ad92f00bca5
+:97e7b7963dc9
 make_cmd = build_cmd_list (["make", "V=1"], nice = nice, opts = opts)
 return Compile (command = make_cmd, workdir = "build", env = build_env,
 warningPattern = ":[0-9][0-9]*:[0-9][0-9]*:warning: ")
 import re
+from buildbot.process import logobserver
 from buildbot.process.results import SUCCESS
 from buildbot.process.results import FAILURE
 from buildbot.process.results import WARNINGS
+class octave_test_observer (logobserver.LogLineObserver):
+def __init__ (self, warningPattern):
+logobserver.LogLineObserver.__init__ (self)
+if warningPattern:
+self.warningPattern = re.compile (warningPattern)
+else:
+self.warningPattern = None
+self.rc = SUCCESS
+self.total = 0
+self.failed = 0
+self.warnings = 0
+self.complete = False
+testsRe = re.compile (r"^  (PASS|FAIL|REGRESSION|XFAIL|SKIP).*(\d+)")
+def outLineReceived (self, line):
+if self.warningPattern.match (line):
+self.warnings += 1
+mo = self.testsRe.search (line)
+if mo:
+type = mo.group(1)
+count = int (mo.group(2))
+self.total += num
+if type == "FAIL" or type == "REGRESSION":
+if count > 0:
+self.rc = FAILURE
+self.failed += count
 class octave_test (Test):
+def __init__ (self, *args, **kwargs):
+Test.__init__ (self, *args, **kwargs)
+self.observer = octave_test_observer (warningPattern = self.warningPattern)
+self.addLogObserver ('stdio', self.observer)
 def evaluateCommand (self, cmd):
-rc = SUCCESS
+if self.observer.total:
-if cmd.didFail ():
+passed = self.observer.total - self.observer.failed
-rc = FAILURE
+self.setTestResults (total = self.observer.total,
-## FIXME: return WARNINGS if there are skipped tests?
+failed = self.observer.failed,
-## FIXME: should probably search for the "^Summary:$" line just
+passed = passed,
-## before the PASS/FAIL totals.
+warnings = self.observer.warnings)
-logtext = "".join(self.getLog('stdio').readlines())
+rc = self.observer.rc
+if rc == SUCCESS and self.observer.warnings:
-m = re.search (r"^ *FAIL +([0-9]+) *$", logtext,
+rc = WARNINGS
-flags = re.MULTILINE)
-## There should always be a line with FAIL, so m should always be a
-## valid match object.  But if it is not, then that is also a
-## failure because there must be something wrong with the log file.
-if not m or int (m.group (1)) != 0:
-rc = FAILURE
-else:
-m = re.search (r"^ *REGRESSION +([0-9]+) *$", logtext,
-flags = re.MULTILINE)
-## If REGRESSION does not appear in the output, then there were none.
-## If it is present, then there should be some regressions, but we'll
-## check anyway.
-if m and int (m.group (1)) != 0:
-rc = FAILURE
 return rc
 def mk_octave_test_step (nice = 0, xvfb = True):
 if xvfb:
 cmd = ["xvfb-run", "-a", "-s", "-screen 0 640x480x24"]
 else:
 cmd = []
 cmd.extend (["make", "V=1", "check"])
 test_cmd = build_cmd_list (cmd, nice = nice)
 return octave_test (command = test_cmd, workdir = "build", env = build_env)
 def mk_octave_factory (nice, configure_opts, compile_opts, branch, xvfb = True):
 factory = BuildFactory ()
 factory.addStep (mk_octave_hg_update_step (octave_hg_repo, branch))
 factory.addStep (mk_octave_bootstrap_step (nice = nice))
 factory.addStep (mk_octave_configure_step (nice = nice, opts = configure_opts))
 factory.addStep (mk_octave_compile_step (nice = nice, opts = compile_opts))
 factory.addStep (mk_octave_test_step (nice = nice, xvfb = xvfb))
 return factory
 def mk_gcc_factory (nice, compile_opts, branch):
 return mk_octave_factory (nice, [], compile_opts, branch)

Mercurial > octave-buildbot

comparison master.cfg @ 1:97e7b7963dc9