Use an empty environment when calling make, but import PATH so the
buildroot tree under test can find binaries 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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
self.testname = self.__class__.__name__
self.builddir = self.outputdir and os.path.join(self.outputdir, self.testname)
self.emulator = None
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):
self.config += "\nBR2_JLEVEL={}\n".format(self.jlevel)
def show_msg(self, msg):
"> end defconfig\n")
self.logfile.flush()
"> end defconfig\n")
self.logfile.flush()
+ env = {"PATH": os.environ["PATH"]}
cmd = ["make",
"O={}".format(self.builddir),
"olddefconfig"]
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]
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")
if ret != 0:
raise SystemError("Build failed")
return 1
BRTest.downloaddir = os.path.abspath(args.download)
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"
if args.output is None:
print "Missing output directory, please use -o/--output"