From mboxrd@z Thu Jan 1 00:00:00 1970 From: Atharva Lele Date: Sat, 29 Jun 2019 10:31:56 +0530 Subject: [Buildroot] [PATCH 09/27] autobuild-run: move toolchains_csv from kwargs to Builder class In-Reply-To: <20190629050214.17852-1-itsatharva@gmail.com> References: <20190629050214.17852-1-itsatharva@gmail.com> Message-ID: <20190629050214.17852-9-itsatharva@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Signed-off-by: Atharva Lele Acked-by: Arnout Vandecappelle (Essensium/Mind) --- Changes v1 -> v2: - Explicitly state class constructor argument --- scripts/autobuild-run | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/autobuild-run b/scripts/autobuild-run index 578ea2e..9c1dbe8 100755 --- a/scripts/autobuild-run +++ b/scripts/autobuild-run @@ -273,7 +273,7 @@ class SystemInfo: class Builder: def __init__(self, instance, njobs, sysinfo, http_url, http_login, http_password, - submitter, make_opts, nice): + submitter, make_opts, nice, toolchains_csv): self.instance = instance self.njobs = njobs self.sysinfo = sysinfo @@ -283,6 +283,7 @@ class Builder: self.submitter = submitter self.make_opts = make_opts self.nice = nice + self.toolchains_csv = toolchains_csv def prepare_build(self, **kwargs): """Prepare for the next build of the specified instance @@ -381,7 +382,7 @@ class Builder: args = [os.path.join(srcdir, "utils/genrandconfig"), "-o", outputdir, "-b", srcdir] - toolchains_csv = kwargs['toolchains_csv'] + toolchains_csv = self.toolchains_csv if toolchains_csv: if not os.path.isabs(toolchains_csv): toolchains_csv = os.path.join(srcdir, toolchains_csv) @@ -861,9 +862,9 @@ def main(): http_password = args['--http-password'], submitter = args['--submitter'], make_opts = (args['--make-opts'] or ''), - nice = (args['--nice'] or 0)) + nice = (args['--nice'] or 0), + toolchains_csv = args['--toolchains-csv']) p = multiprocessing.Process(target=builder.run_instance, kwargs=dict( - toolchains_csv = args['--toolchains-csv'], repo = args['--repo'], upload = upload, buildpid = buildpid, -- 2.20.1