From: Atharva Lele <itsatharva@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v4 16/30] autobuild-run: remove kwargs argument from function calls and definitions
Date: Thu, 1 Aug 2019 08:16:29 +0530 [thread overview]
Message-ID: <20190801024643.11024-17-itsatharva@gmail.com> (raw)
In-Reply-To: <20190801024643.11024-1-itsatharva@gmail.com>
Signed-off-by: Atharva Lele <itsatharva@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
scripts/autobuild-run | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/scripts/autobuild-run b/scripts/autobuild-run
index cb00745..adc8795 100755
--- a/scripts/autobuild-run
+++ b/scripts/autobuild-run
@@ -298,7 +298,7 @@ class Builder:
else:
self.log = open(os.path.join(self.idir, "instance.log"), "a+")
- def prepare_build(self, **kwargs):
+ def prepare_build(self):
"""Prepare for the next build of the specified instance
This function prepares the build by making sure all the needed
@@ -375,7 +375,7 @@ class Builder:
return 0
- def gen_config(self, **kwargs):
+ def gen_config(self):
"""Generate a new random configuration."""
outputdir = os.path.abspath(os.path.join(self.idir, "output"))
srcdir = os.path.join(self.idir, "buildroot")
@@ -417,7 +417,7 @@ class Builder:
break
monitor_thread_stop_flag.wait(30)
- def check_reproducibility(self, **kwargs):
+ def check_reproducibility(self):
"""Check reproducibility of builds
Use diffoscope on the built images, if diffoscope is not
@@ -452,7 +452,7 @@ class Builder:
log_write(self.log, "INFO: Build is reproducible!")
return 0
- def do_build(self, **kwargs):
+ def do_build(self):
"""Run the build itself"""
# We need the absolute path to use with O=, because the relative
@@ -509,7 +509,7 @@ class Builder:
log_write(self.log, "INFO: build successful")
return 0
- def do_reproducible_build(self, **kwargs):
+ def do_reproducible_build(self):
"""Run the builds for reproducibility testing
Build twice with the same configuration. Calls do_build() to
@@ -521,7 +521,7 @@ class Builder:
# Start the first build
log_write(self.log, "INFO: Reproducible Build Test, starting build 1")
- ret = self.do_build(**kwargs)
+ ret = self.do_build()
if ret != 0:
log_write(self.log, "INFO: build 1 failed, skipping build 2")
return ret
@@ -535,16 +535,16 @@ class Builder:
# Start the second build
log_write(self.log, "INFO: Reproducible Build Test, starting build 2")
- ret = self.do_build(**kwargs)
+ ret = self.do_build()
if ret != 0:
log_write(self.log, "INFO: build 2 failed")
return ret
# Assuming both have built successfully
- ret = self.check_reproducibility(**kwargs)
+ ret = self.check_reproducibility()
return ret
- def send_results(self, result, **kwargs):
+ def send_results(self, result):
"""Prepare and store/send tarball with results
This function prepares the tarball with the results, and either
@@ -705,7 +705,7 @@ class Builder:
os.rename(os.path.join(outputdir, "results.tar.bz2"), resultfilename)
log_write(self.log, "INFO: results saved as %s" % resultfilename)
- def run_instance(self, **kwargs):
+ def run_instance(self):
"""Main per-instance loop
Prepare the build, generate a configuration, run the build, and submit the
@@ -721,14 +721,14 @@ class Builder:
while True:
check_version()
- ret = self.prepare_build(**kwargs)
+ ret = self.prepare_build()
if ret != 0:
continue
resultdir = os.path.join(self.idir, "output", "results")
os.mkdir(resultdir)
- ret = self.gen_config(**kwargs)
+ ret = self.gen_config()
if ret != 0:
log_write(self.log, "WARN: failed to generate configuration")
continue
@@ -738,11 +738,11 @@ class Builder:
with open(os.path.join(outputdir, ".config"), "r") as fconf:
reproducible = "BR2_REPRODUCIBLE=y\n" in fconf.read()
if reproducible:
- ret = self.do_reproducible_build(**kwargs)
+ ret = self.do_reproducible_build()
else:
- ret = self.do_build(**kwargs)
+ ret = self.do_build()
- self.send_results(ret, **kwargs)
+ self.send_results(ret)
# args / config file merging inspired by:
# https://github.com/docopt/docopt/blob/master/examples/config_file_example.py
--
2.22.0
next prev parent reply other threads:[~2019-08-01 2:46 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-01 2:46 [Buildroot] [PATCH v4 00/30] builder-class series cover letter Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 01/30] autobuild-run: introduce Builder class Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 02/30] autobuild-run: move instance variable from kwargs to " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 03/30] autobuild-run: move njobs " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 04/30] autobuild-run: move sysinfo " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 05/30] autobuild-run: move http variables " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 06/30] autobuild-run: move submitter " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 07/30] autobuild-run: move make_opts " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 08/30] autobuild-run: move niceness " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 09/30] autobuild-run: move toolchains_csv " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 10/30] autobuild-run: move repo " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 11/30] autobuild-run: move upload variable " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 12/30] autobuild-run: move buildpid " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 13/30] autobuild-run: move debug " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 14/30] autobuild-run: define instance directory as a part of " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 15/30] autobuild-run: move log variable to " Atharva Lele
2019-08-01 2:46 ` Atharva Lele [this message]
2019-08-01 2:46 ` [Buildroot] [PATCH v4 17/30] autobuild-run: define source directory as part of " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 18/30] autobuild-run: define download " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 19/30] autobuild-run: define output " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 20/30] autobuild-run: define results " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 21/30] autobuild-run: move check_version() to " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 22/30] autobuild-run: move get_branch() " Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 23/30] scripts/autobuild-run: make the HTTP URL really configurable Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 24/30] autobuild-run: create reason file on build failures Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 25/30] web/import.inc.php: support reading failure reason from reason file Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 26/30] scripts/autobuild-run: support changing repo Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 27/30] autobuild-run: modify do_build() to accept outputdir as argument Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 28/30] autobuild-run: define different output directory for reproducible builds Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 29/30] autobuild-run: use different output directories for reproducible builds testing Atharva Lele
2019-08-01 2:46 ` [Buildroot] [PATCH v4 30/30] autobuild-run: make prepare_build() clean the output directory used for reproducibility testing Atharva Lele
2019-08-01 8:39 ` [Buildroot] [PATCH v4 00/30] builder-class series cover letter Thomas Petazzoni
2019-08-01 10:46 ` 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=20190801024643.11024-17-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