[Buildroot] [PATCH 6/6] autobuild-run: account for reproducibility failures in get_failure_reason()
Atharva Lele
itsatharva at gmail.com
Tue Aug 6 18:12:51 UTC 2019
Signed-off-by: Atharva Lele <itsatharva at 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
More information about the buildroot
mailing list