summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-08-09 16:59:12 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-13 09:37:36 +0100
commit1371cff985f029e972b0339ae334c95690b8ec30 (patch)
tree0e01714cce644bee3b6fd3a79376b098371bdc7f
parent3276bded22a67b5dbbd726eaf9c21fc8e8effb38 (diff)
downloadpoky-1371cff985f029e972b0339ae334c95690b8ec30.tar.gz
lib/oeqa/utils/qemurunner.py: add runqemuparams after kvm/nographic/snapshot/slirp
Previously, 'nographic' was set first, and was overriding anything set via runqemuparams. Particularly, egl-headless from the virgl headless selftest was overriden, which broke the test in non-X environments. (From OE-Core rev: 344c55a58042ecd6ffed8b20add41b6b335c51bf) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index b1999fde85..fe8b77d97a 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -126,7 +126,7 @@ class QemuRunner:
126 env["DEPLOY_DIR_IMAGE"] = self.deploy_dir_image 126 env["DEPLOY_DIR_IMAGE"] = self.deploy_dir_image
127 127
128 if not launch_cmd: 128 if not launch_cmd:
129 launch_cmd = 'runqemu %s %s ' % ('snapshot' if discard_writes else '', runqemuparams) 129 launch_cmd = 'runqemu %s' % ('snapshot' if discard_writes else '')
130 if self.use_kvm: 130 if self.use_kvm:
131 self.logger.debug('Using kvm for runqemu') 131 self.logger.debug('Using kvm for runqemu')
132 launch_cmd += ' kvm' 132 launch_cmd += ' kvm'
@@ -136,7 +136,7 @@ class QemuRunner:
136 launch_cmd += ' nographic' 136 launch_cmd += ' nographic'
137 if self.use_slirp: 137 if self.use_slirp:
138 launch_cmd += ' slirp' 138 launch_cmd += ' slirp'
139 launch_cmd += ' %s %s' % (self.machine, self.rootfs) 139 launch_cmd += ' %s %s %s' % (runqemuparams, self.machine, self.rootfs)
140 140
141 return self.launch(launch_cmd, qemuparams=qemuparams, get_ip=get_ip, extra_bootparams=extra_bootparams, env=env) 141 return self.launch(launch_cmd, qemuparams=qemuparams, get_ip=get_ip, extra_bootparams=extra_bootparams, env=env)
142 142