From patchwork Fri Apr 1 00:02:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Weber X-Patchwork-Id: 604550 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 3qbhRW4M5Zz9s9Z for ; Fri, 1 Apr 2016 11:03:19 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=dx+2BESv; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A34F391B77; Fri, 1 Apr 2016 00:03:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WfdKYvOZeVsz; Fri, 1 Apr 2016 00:03:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C946E91BAA; Fri, 1 Apr 2016 00:03:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id D10271CF567 for ; Fri, 1 Apr 2016 00:03:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CADEB27262 for ; Fri, 1 Apr 2016 00:03:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qJtgDhMocGtW for ; Fri, 1 Apr 2016 00:03:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ig0-f195.google.com (mail-ig0-f195.google.com [209.85.213.195]) by silver.osuosl.org (Postfix) with ESMTPS id C3FCD339DF for ; Fri, 1 Apr 2016 00:03:05 +0000 (UTC) Received: by mail-ig0-f195.google.com with SMTP id mh10so320839igb.1 for ; Thu, 31 Mar 2016 17:03:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=fwYqh6CdxA2HjmdGtAE8WKhtT9nzGVdPCNKcbBMiHA0=; b=dx+2BESvRZ+Pgg1gIec/sZfCXtF3zyBxDL5KVyFvlceJSIfk5Ar/esXhuSAOZiZJgN 6Lt3UBCq5Xe/UWl3oIllQeCxhjGO1ef2KsQKT2Q4jPUeMJCCpw0gn3+ZUUO7apORTwj+ wvk5HVS9UwBBLv3hVtGt01+maSqU8EFBX3LvU+jyXI2BO+OSkNOwx+CxXtTzxN081Qak TWDZX+CRYOjI9KTvd3ktwJaLCbre7grPqjQYyESm4j0UG3zrPtfs/pr/zkZen9HgndP9 VvGX+PNxHTckekPcGGERui3PK/HTY+ou5EaANmoyL7kwlriOd/25bFgyuRg5XRYpaqEx qbrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=fwYqh6CdxA2HjmdGtAE8WKhtT9nzGVdPCNKcbBMiHA0=; b=TxayZZJ9F8jsbvmrdV3OXSUth/kw/ibtATJuzCZwk88wmKWg3DpR2zyXTflBz2zsL1 fiz7OzKY/xHF1Y3dODQLm/7xQ6vxQJrkh/c7ZFsPMpksg61ka9qPgidRNCBeHg6tWdXg EOEKmRIXTPZw375j9j2S7LlW0VGJyrJRttLlunpD/IaVnh7pG2uLsusLJ0trZamZlcZV lGP5ypGevL5Jauq7m0ot1ivRxuhPJEs97viGqoaAoSu6xc/F2p9lDe9U7a38XqojaXr9 lYKt6ZbRS+7lqsmuuGjgrDG3U+oxBNVGwOL9JzIlub9V1ENw4EYkgVCLXRNXIry3SyrQ 8rvA== X-Gm-Message-State: AD7BkJJY5teiedS+fekCQrvwtUGqW7gJlBC/W1Ac6KKdNA7CWpzeSkwzajbXBQKKY/NKVw== X-Received: by 10.50.138.5 with SMTP id qm5mr412204igb.69.1459468984574; Thu, 31 Mar 2016 17:03:04 -0700 (PDT) Received: from localhost.localdomain (173-28-136-113.client.mchsi.com. [173.28.136.113]) by smtp.gmail.com with ESMTPSA id v21sm4821477iov.4.2016.03.31.17.03.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Mar 2016 17:03:03 -0700 (PDT) From: Matt Weber To: buildroot@buildroot.org Date: Thu, 31 Mar 2016 19:02:52 -0500 Message-Id: <1459468972-31420-2-git-send-email-matt@thewebers.ws> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459468972-31420-1-git-send-email-matt@thewebers.ws> References: <1459468972-31420-1-git-send-email-matt@thewebers.ws> Subject: [Buildroot] [PATCH v2 2/2] buildroot-test: failure reason regex update X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - 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 --- 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