| Message ID | 20171029140608.26200-2-ricardo.martincoski@datacom.ind.br |
|---|---|
| State | Accepted |
| Headers | show |
| Series | tests for git download infra (series 1/3) | expand |
Hello, On Sun, 29 Oct 2017 12:06:00 -0200, Ricardo Martincoski wrote: > From: Ricardo Martincoski <ricardo.martincoski@gmail.com> > > Use an empty environment when calling make, but import PATH so the > buildroot tree under test can find libraries from the host machine. > > Since environment variables are now ignored, move the handling of > BR2_DL_DIR to the defconfig to keep the current precedence of -d: > > BR2_DL_DIR | -d DIR | test downloads | BR downloads > ------------+----------+------------------+-------------- > unset | unset | [error] | [error] > unset | set | in $(DIR) | in $(DIR) > set | unset | in $(BR2_DL_DIR) | in $(BR2_DL_DIR) > set | set | in $(DIR) | in $(DIR) > > Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> > Cc: Arnout Vandecappelle <arnout@mind.be> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > Cc: Yann E. MORIN <yann.morin.1998@free.fr> > --- > Changes v2 -> v3: > - new patch > - search for "start with an empty environment" in > http://patchwork.ozlabs.org/patch/806159/ > --- > support/testing/infra/basetest.py | 1 + > support/testing/infra/builder.py | 7 +++++-- > support/testing/run-tests | 1 - > 3 files changed, 6 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas
diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index 754922692c..b85e8627fd 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -42,6 +42,7 @@ class BRTest(unittest.TestCase): self.testname = self.__class__.__name__ self.builddir = self.outputdir and os.path.join(self.outputdir, self.testname) self.emulator = None + self.config += '\nBR2_DL_DIR="{}"\n'.format(self.downloaddir) self.config += "\nBR2_JLEVEL={}\n".format(self.jlevel) def show_msg(self, msg): diff --git a/support/testing/infra/builder.py b/support/testing/infra/builder.py index 7512339ae1..36f4801a2d 100644 --- a/support/testing/infra/builder.py +++ b/support/testing/infra/builder.py @@ -24,15 +24,18 @@ class Builder(object): "> end defconfig\n") self.logfile.flush() + env = {"PATH": os.environ["PATH"]} cmd = ["make", "O={}".format(self.builddir), "olddefconfig"] - ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile) + ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile, + env=env) if ret != 0: raise SystemError("Cannot olddefconfig") cmd = ["make", "-C", self.builddir] - ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile) + ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile, + env=env) if ret != 0: raise SystemError("Build failed") diff --git a/support/testing/run-tests b/support/testing/run-tests index f8cee09ed1..270e78cff7 100755 --- a/support/testing/run-tests +++ b/support/testing/run-tests @@ -58,7 +58,6 @@ def main(): return 1 BRTest.downloaddir = os.path.abspath(args.download) - os.putenv("BR2_DL_DIR", BRTest.downloaddir) if args.output is None: print "Missing output directory, please use -o/--output"