diff options
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/runqemu.py | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/targetcontrol.py | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/utils/commands.py | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py b/meta/lib/oeqa/selftest/cases/runqemu.py index 7e676bcb416..112a0b540ca 100644 --- a/meta/lib/oeqa/selftest/cases/runqemu.py +++ b/meta/lib/oeqa/selftest/cases/runqemu.py @@ -105,7 +105,7 @@ SYSLINUX_TIMEOUT = "10" def test_boot_machine_slirp(self): """Test runqemu machine slirp""" cmd = "%s slirp %s" % (self.cmd_common, self.machine) - with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: + with runqemu(self.recipe, ssh=True, use_slirp=True, launch_cmd=cmd) as qemu: with open(qemu.qemurunnerlog) as f: self.assertIn(' -netdev user', f.read(), "Failed: %s" % cmd) diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index 0b2915d5ccd..9779e196270 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py @@ -112,6 +112,7 @@ class QemuTarget(BaseTarget): if not dump_dir: dump_dir = os.path.join(d.getVar('LOG_DIR'), 'runtime-hostdump') use_kvm = oe.types.qemu_use_kvm(d.getVar('QEMU_USE_KVM'), d.getVar('TARGET_ARCH')) + use_slirp = oe.types.boolean(d.getVar('QEMU_USE_SLIRP')) # Log QemuRunner log output to a file import oe.path @@ -141,6 +142,7 @@ class QemuTarget(BaseTarget): logfile = self.qemulog, boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT")), use_kvm = use_kvm, + use_slirp = use_slirp, dump_dir = dump_dir, dump_host_cmds = d.getVar("testimage_dump_host"), logger = logger, diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index dc1e286dacf..230258ca562 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py @@ -296,7 +296,7 @@ def create_temp_layer(templayerdir, templayername, priority=999, recipepathspec= f.write('LAYERSERIES_COMPAT_%s = "${LAYERSERIES_COMPAT_core}"\n' % templayername) @contextlib.contextmanager -def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None, qemuparams=None, overrides={}, discard_writes=True): +def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None, qemuparams=None, overrides={}, discard_writes=True, use_slirp=False): """ launch_cmd means directly run the command, don't need set rootfs or env vars. """ @@ -322,6 +322,8 @@ def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None, tinfoil.config_data.setVar("FIND_ROOTFS", '0') else: tinfoil.config_data.setVar("FIND_ROOTFS", '1') + if use_slirp: + tinfoil.config_data.setVar('QEMU_USE_SLIRP', '1') recipedata = tinfoil.parse_recipe(pn) for key, value in overrides.items(): |