From: Atharva Lele <itsatharva@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v4 4/5] autobuild-run: move with open to appropriate place in check_reproducibility()
Date: Tue, 20 Aug 2019 20:22:30 +0530 [thread overview]
Message-ID: <20190820145231.15507-4-itsatharva@gmail.com> (raw)
In-Reply-To: <20190820145231.15507-1-itsatharva@gmail.com>
Since we switched to using diffoscope's ability to write to a file, having a
with open() does not make sense while running the command. Instead, move it to
the else condition where it can be used by cmp.
Signed-off-by: Atharva Lele <itsatharva@gmail.com>
---
scripts/autobuild-run | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/scripts/autobuild-run b/scripts/autobuild-run
index 876feb2..c25413b 100755
--- a/scripts/autobuild-run
+++ b/scripts/autobuild-run
@@ -446,19 +446,19 @@ class Builder:
build_1_image = os.path.join(self.outputdir, "images", "rootfs.tar")
build_2_image = os.path.join(self.outputdir_2, "images", "rootfs.tar")
- with open(reproducible_results, 'w') as diff:
- if self.sysinfo.has("diffoscope"):
- # Prefix to point diffoscope towards cross-tools
- prefix = subprocess.check_output(["make", "--no-print-directory", "O=%s" % self.outputdir,
- "-C", self.srcdir, "printvars", "VARS=TARGET_CROSS"])
- # Remove TARGET_CROSS= and \n from the string
- prefix = prefix[13:-1]
- log_write(self.log, "INFO: running diffoscope on images")
- subprocess.call(["diffoscope", build_1_image, build_2_image,
- "--tool-prefix-binutils", prefix, "--json", reproducible_results,
- "--text", reproducible_results_txt, "--max-text-report-size", "40000"],
- stderr=self.log)
- else:
+ if self.sysinfo.has("diffoscope"):
+ # Prefix to point diffoscope towards cross-tools
+ prefix = subprocess.check_output(["make", "--no-print-directory", "O=%s" % self.outputdir,
+ "-C", self.srcdir, "printvars", "VARS=TARGET_CROSS"])
+ # Remove TARGET_CROSS= and \n from the string
+ prefix = prefix[13:-1]
+ log_write(self.log, "INFO: running diffoscope on images")
+ subprocess.call(["diffoscope", build_1_image, build_2_image,
+ "--tool-prefix-binutils", prefix, "--json", reproducible_results,
+ "--text", reproducible_results_txt, "--max-text-report-size", "40000"],
+ stderr=self.log)
+ else:
+ with open(reproducible_results_txt, 'w') as diff:
log_write(self.log, "INFO: diffoscope not installed, falling back to cmp")
subprocess.call(["cmp", "-b", build_1_image, build_2_image], stdout=diff, stderr=self.log)
--
2.22.0
next prev parent reply other threads:[~2019-08-20 14:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-20 14:52 [Buildroot] [PATCH v4 1/5] autobuild-run: check if reproducibile_results exists before checking its size Atharva Lele
2019-08-20 14:52 ` [Buildroot] [PATCH v4 2/5] autobuild-run: initial implementation of get_reproducibility_failure_reason() Atharva Lele
2019-09-08 17:06 ` Arnout Vandecappelle
2019-09-08 22:42 ` Thomas Petazzoni
2019-09-09 7:35 ` Arnout Vandecappelle
2019-09-09 7:45 ` Thomas Petazzoni
2019-09-12 12:47 ` Atharva Lele
2019-09-14 17:27 ` Arnout Vandecappelle
2019-08-20 14:52 ` [Buildroot] [PATCH v4 3/5] autobuild-run: account for reproducibility failures in get_failure_reason() Atharva Lele
2019-09-08 17:13 ` Arnout Vandecappelle
2019-09-12 12:59 ` Atharva Lele
2019-09-14 17:33 ` Arnout Vandecappelle
2019-08-20 14:52 ` Atharva Lele [this message]
2019-08-20 14:52 ` [Buildroot] [PATCH v4 5/5] autobuild-run: initial implementation of categorization() of nonreproducibility Atharva Lele
2019-09-08 16:43 ` [Buildroot] [PATCH v4 1/5] autobuild-run: check if reproducibile_results exists before checking its size Arnout Vandecappelle
2019-09-12 12:00 ` Atharva Lele
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=20190820145231.15507-4-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.