mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

QemuRunner: avoid tainting os.environ

Browse Source 
That a utility function permanently changes the process environment is
bad style and leads to subtle, hard to debug problems.

For example, we had one oe-selftest which used runqemu() with an
override for DEPLOY_DIR_IMAGE. Another test then just called runCmd()
and ended up passing the wrong DEPLOY_DIR_IMAGE set earlier in
os.environ.

The approach used here is to pass the desired environment dict to the
launch() method as a new, optional parameter, which then gets passed
on to subproject.Popen(). The modified env variables do not get
logged, as before.

[YOCTO #11443]

(From OE-Core rev: cab20f3b2fe668a63c58b44f2ad797fed74226fe)

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Patrick Ohly
2017-05-03 15:38:53 +02:00
committed by Richard Purdie
parent 5b649b4bbd
commit 0ef6fc5f9b
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/utils/qemurunner.py
+8 -7
View File
@@ -98,11 +98,12 @@ class QemuRunner:
raise SystemExit raise SystemExit
def start(self, qemuparams = None, get_ip = True, extra_bootparams = None, runqemuparams='', launch_cmd=None, discard_writes=True): def start(self, qemuparams = None, get_ip = True, extra_bootparams = None, runqemuparams='', launch_cmd=None, discard_writes=True):
env = os.environ.copy()
if self.display: if self.display:
os.environ["DISPLAY"] = self.display env["DISPLAY"] = self.display
# Set this flag so that Qemu doesn't do any grabs as SDL grabs # Set this flag so that Qemu doesn't do any grabs as SDL grabs
# interact badly with screensavers. # interact badly with screensavers.
os.environ["QEMU_DONT_GRAB"] = "1" env["QEMU_DONT_GRAB"] = "1"
if not os.path.exists(self.rootfs): if not os.path.exists(self.rootfs):
logger.error("Invalid rootfs %s" % self.rootfs) logger.error("Invalid rootfs %s" % self.rootfs)
return False return False
@@ -110,12 +111,12 @@ class QemuRunner:
logger.error("Invalid TMPDIR path %s" % self.tmpdir) logger.error("Invalid TMPDIR path %s" % self.tmpdir)
return False return False
else: else:
os.environ["OE_TMPDIR"] = self.tmpdir env["OE_TMPDIR"] = self.tmpdir
if not os.path.exists(self.deploy_dir_image): if not os.path.exists(self.deploy_dir_image):
logger.error("Invalid DEPLOY_DIR_IMAGE path %s" % self.deploy_dir_image) logger.error("Invalid DEPLOY_DIR_IMAGE path %s" % self.deploy_dir_image)
return False return False
else: else:
os.environ["DEPLOY_DIR_IMAGE"] = self.deploy_dir_image env["DEPLOY_DIR_IMAGE"] = self.deploy_dir_image
if not launch_cmd: if not launch_cmd:
launch_cmd = 'runqemu %s %s ' % ('snapshot' if discard_writes else '', runqemuparams) launch_cmd = 'runqemu %s %s ' % ('snapshot' if discard_writes else '', runqemuparams)
@@ -128,9 +129,9 @@ class QemuRunner:
launch_cmd += ' nographic' launch_cmd += ' nographic'
launch_cmd += ' %s %s' % (self.machine, self.rootfs) launch_cmd += ' %s %s' % (self.machine, self.rootfs)
return self.launch(launch_cmd, qemuparams=qemuparams, get_ip=get_ip, extra_bootparams=extra_bootparams) return self.launch(launch_cmd, qemuparams=qemuparams, get_ip=get_ip, extra_bootparams=extra_bootparams, env=env)
def launch(self, launch_cmd, get_ip = True, qemuparams = None, extra_bootparams = None): def launch(self, launch_cmd, get_ip = True, qemuparams = None, extra_bootparams = None, env = None):
try: try:
threadsock, threadport = self.create_socket() threadsock, threadport = self.create_socket()
self.server_socket, self.serverport = self.create_socket() self.server_socket, self.serverport = self.create_socket()
@@ -157,7 +158,7 @@ class QemuRunner:
# blocking at the end of the runqemu script when using this within # blocking at the end of the runqemu script when using this within
# oe-selftest (this makes stty error out immediately). There ought # oe-selftest (this makes stty error out immediately). There ought
# to be a proper fix but this will suffice for now. # to be a proper fix but this will suffice for now.
self.runqemu = subprocess.Popen(launch_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE, preexec_fn=os.setpgrp) self.runqemu = subprocess.Popen(launch_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE, preexec_fn=os.setpgrp, env=env)
output = self.runqemu.stdout output = self.runqemu.stdout
# #