From 361bc21c523e0e6f030080eb910dfb53e4614c7b Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Wed, 11 Jul 2018 09:31:11 -0500 Subject: support/testing: runtest proxy support Allow builder.py to inherit the system proxy settings from the env if they are present. Signed-off-by: Matthew Weber Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- support/testing/infra/builder.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'support/testing/infra/builder.py') diff --git a/support/testing/infra/builder.py b/support/testing/infra/builder.py index faf1eb1494..30230fdb17 100644 --- a/support/testing/infra/builder.py +++ b/support/testing/infra/builder.py @@ -35,6 +35,12 @@ class Builder(object): def build(self): env = {"PATH": os.environ["PATH"]} + if "http_proxy" in os.environ: + self.logfile.write("Using system proxy: " + + os.environ["http_proxy"] + "\n") + self.logfile.flush() + env['http_proxy'] = os.environ["http_proxy"] + env['https_proxy'] = os.environ["http_proxy"] cmd = ["make", "-C", self.builddir] ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile, env=env) -- cgit v1.2.3 From b25c39ebd98b824a5e3aba0ee4a73f3179b40c5e Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Fri, 10 Aug 2018 20:02:26 -0500 Subject: support/testing/infra: rm extra log flush in builder.py While integrating proxy support in builder.py, a log flush was left in the code. This commit cleans/removes that code. Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- support/testing/infra/builder.py | 1 - 1 file changed, 1 deletion(-) (limited to 'support/testing/infra/builder.py') diff --git a/support/testing/infra/builder.py b/support/testing/infra/builder.py index 30230fdb17..fc318fe26e 100644 --- a/support/testing/infra/builder.py +++ b/support/testing/infra/builder.py @@ -38,7 +38,6 @@ class Builder(object): if "http_proxy" in os.environ: self.logfile.write("Using system proxy: " + os.environ["http_proxy"] + "\n") - self.logfile.flush() env['http_proxy'] = os.environ["http_proxy"] env['https_proxy'] = os.environ["http_proxy"] cmd = ["make", "-C", self.builddir] -- cgit v1.2.3