Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Atharva Lele <itsatharva@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 6/6] autobuild-run: account for reproducibility failures in get_failure_reason()
Date: Tue,  6 Aug 2019 23:42:51 +0530	[thread overview]
Message-ID: <20190806181251.21885-6-itsatharva@gmail.com> (raw)
In-Reply-To: <20190806181251.21885-1-itsatharva@gmail.com>

Signed-off-by: Atharva Lele <itsatharva@gmail.com>
---
 scripts/autobuild-run | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/scripts/autobuild-run b/scripts/autobuild-run
index f2f6460..1f12355 100755
--- a/scripts/autobuild-run
+++ b/scripts/autobuild-run
@@ -669,15 +669,26 @@ class Builder:
 
         def get_failure_reason():
             # Output is a tuple (package, version), or None.
-            lastlines = decode_bytes(subprocess.Popen(
-                ["tail", "-n", "3", os.path.join(self.outputdir, "logfile")],
-                stdout=subprocess.PIPE).communicate()[0]).splitlines()
-
-            regexp = re.compile(r'make: \*\*\* .*/(?:build|toolchain)/([^/]*)/')
-            for line in lastlines:
-                m = regexp.search(line)
-                if m:
-                    return m.group(1).rsplit('-', 1)
+            # Output is "package-reproducible" in case of reproducibility failure.
+
+            reproducible_results = os.path.join(self.resultdir, "reproducible_results")
+            if os.path.exists(reproducible_results) and os.stat(reproducible_results).st_size > 0:
+                if self.sysinfo.has("diffoscope"):
+                    reason = get_reproducibility_failure_reason(reproducible_results)
+                    reason.append("nonreproducible")
+                    return reason
+                else:
+                    return ["nonreproducible"]
+            else:
+                lastlines = decode_bytes(subprocess.Popen(
+                    ["tail", "-n", "3", os.path.join(self.outputdir, "logfile")],
+                    stdout=subprocess.PIPE).communicate()[0]).splitlines()
+
+                regexp = re.compile(r'make: \*\*\* .*/(?:build|toolchain)/([^/]*)/')
+                for line in lastlines:
+                    m = regexp.search(line)
+                    if m:
+                        return m.group(1).rsplit('-', 1)
 
             # not found
             return None
-- 
2.22.0

  parent reply	other threads:[~2019-08-06 18:12 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-06 18:12 [Buildroot] [PATCH 1/6] autobuild-run: use different output directories for reproducible builds testing Atharva Lele
2019-08-06 18:12 ` [Buildroot] [PATCH 2/6] autobuild-run: make prepare_build() clean the output directory used for reproducibility testing Atharva Lele
2019-08-06 18:12 ` [Buildroot] [PATCH 3/6] autobuild-run: fix cross tools prefix for diffoscope Atharva Lele
2019-08-06 20:18   ` Thomas Petazzoni
2019-08-06 18:12 ` [Buildroot] [PATCH 4/6] autobuild-run: make diffoscope output to a JSON-formatted file Atharva Lele
2019-08-06 19:40   ` Thomas Petazzoni
2019-08-07  6:12     ` Atharva Lele
2019-08-06 18:12 ` [Buildroot] [PATCH 5/6] autobuild-run: initial implementation of get_reproducibility_failure_reason() Atharva Lele
2019-08-06 20:21   ` Thomas Petazzoni
2019-08-07  6:07     ` Atharva Lele
2019-08-06 18:12 ` Atharva Lele [this message]
2019-08-06 19:37 ` [Buildroot] [PATCH 1/6] autobuild-run: use different output directories for reproducible builds testing Thomas Petazzoni
2019-08-07  6:02   ` Atharva Lele
2019-08-07  8:33     ` Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190806181251.21885-6-itsatharva@gmail.com \
    --to=itsatharva@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox