|
@@ -322,7 +322,7 @@ def testimage_main(d):
|
|
|
ovmf = d.getVar("QEMU_USE_OVMF")
|
|
|
|
|
|
slirp = False
|
|
|
- if d.getVar("QEMU_USE_SLIRP"):
|
|
|
+ if d.getVar("QEMU_USE_SLIRP") or bb.utils.contains('TEST_RUNQEMUPARAMS', 'slirp', True, False, d):
|
|
|
slirp = True
|
|
|
|
|
|
# TODO: We use the current implementation of qemu runner because of
|
|
@@ -369,10 +369,18 @@ def testimage_main(d):
|
|
|
# runtime use network for download projects for build
|
|
|
export_proxies(d)
|
|
|
|
|
|
+ if slirp:
|
|
|
+ target_ip = "127.0.0.1"
|
|
|
+ # from qemu target to host with default DHCP server
|
|
|
+ server_ip = "10.0.2.2"
|
|
|
+ else:
|
|
|
+ target_ip = d.getVar("TEST_TARGET_IP")
|
|
|
+ server_ip = d.getVar("TEST_SERVER_IP")
|
|
|
+
|
|
|
# the robot dance
|
|
|
target = OERuntimeTestContextExecutor.getTarget(
|
|
|
- d.getVar("TEST_TARGET"), logger, d.getVar("TEST_TARGET_IP"),
|
|
|
- d.getVar("TEST_SERVER_IP"), **target_kwargs)
|
|
|
+ d.getVar("TEST_TARGET"), logger, target_ip,
|
|
|
+ server_ip, **target_kwargs)
|
|
|
|
|
|
# test context
|
|
|
tc = OERuntimeTestContext(td, logger, target, image_packages, extract_dir)
|