[Buildroot] [PATCH v2 2/2] buildroot-test: failure reason regex update
Matt Weber
matt at thewebers.ws
Fri Apr 1 00:02:52 UTC 2016
- Sub-make required one additional line tailed
- Both autobuild-run regex to truncate end log
and import which sets the failure reason on
the report are updated
Signed-off-by: Matt Weber <matt at thewebers.ws>
--
Changes for v2:
- Added back in : as previous test masked
that is was ok to leave in (Suggested by Thomas)
---
scripts/autobuild-run | 4 ++--
web/import.inc.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/autobuild-run b/scripts/autobuild-run
index 1fbf482..f9743a8 100755
--- a/scripts/autobuild-run
+++ b/scripts/autobuild-run
@@ -665,10 +665,10 @@ def send_results(result, **kwargs):
def get_failure_reason():
# Output is a tuple (package, version), or None.
lastlines = decode_bytes(subprocess.Popen(
- ["tail", "-n", "3", os.path.join(outputdir, "logfile")],
+ ["tail", "-n", "4", os.path.join(outputdir, "logfile")],
stdout=subprocess.PIPE).communicate()[0]).splitlines()
- regexp = re.compile(r'make: \*\*\* .*/(?:build|toolchain)/([^/]*)/')
+ regexp = re.compile(r'make.*: \*\*\* .*/(?:build|toolchain)/([^/]*)/')
for line in lastlines:
m = regexp.search(line)
if m:
diff --git a/web/import.inc.php b/web/import.inc.php
index 243a1f3..e169f6f 100644
--- a/web/import.inc.php
+++ b/web/import.inc.php
@@ -102,7 +102,7 @@ function import_result($buildid, $filename)
$reason = "none";
else {
$tmp = Array();
- exec("tail -3 " . $thisbuildfinaldir . "build-end.log | grep -v '\[_all\]' | grep 'make.*: \*\*\*' | sed 's,.*\[\([^\]*\)\] Error.*,\\1,' | sed 's,.*/build/\([^/]*\)/.*,\\1,'", $tmp);
+ exec("tail -4 " . $thisbuildfinaldir . "build-end.log | grep -v '\[_all\]' | grep 'make.*: \*\*\*' | sed 's,.*\[\([^\]*\)\] Error.*,\\1,' | sed 's,.*/build/\([^/]*\)/.*,\\1,'", $tmp);
if (trim($tmp[0]))
$reason = $tmp[0];
else
--
2.5.0
More information about the buildroot
mailing list