diff options
author | Alejandro Hernandez Samaniego <alejandro@enedino.org> | 2020-02-08 02:30:04 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-13 12:19:14 +0000 |
commit | e5978093075fe84ac949b2f4022f92e3f83ec2c0 (patch) | |
tree | 2cb5a60ac829f47416ac3cb78c8be002432f32a0 | |
parent | 575e4b22278081c86df1b0bce595d91a09a1cdbf (diff) | |
download | poky-e5978093075fe84ac949b2f4022f92e3f83ec2c0.tar.gz |
testimage: Allow testing on QEMU machines with a single serial port
commmit 6cde67d0a84 enables the use of qemurunner on machines that
only have a single serial port, but still sets the default value
as serial_ports=2 if not provided.
The testimage class does not call qemurunner with a serial_ports
argument, hence always defaulting to two.
Pass the serial_ports argument from the testimage class to allow
tests to run on QEMU machines with a single serial port.
(From OE-Core rev: a50d0163770f0b405a8de8a8a9cccd48c1de4112)
Signed-off-by: Alejandro Hernandez Samaniego <alejandro@enedino.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/testimage.bbclass | 1 | ||||
-rw-r--r-- | meta/lib/oeqa/core/target/qemu.py | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 844ed87944..0d55c3247e 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass | |||
@@ -256,6 +256,7 @@ def testimage_main(d): | |||
256 | 'kvm' : kvm, | 256 | 'kvm' : kvm, |
257 | 'slirp' : slirp, | 257 | 'slirp' : slirp, |
258 | 'dump_dir' : d.getVar("TESTIMAGE_DUMP_DIR"), | 258 | 'dump_dir' : d.getVar("TESTIMAGE_DUMP_DIR"), |
259 | 'serial_ports': len(d.getVar("SERIAL_CONSOLES").split()), | ||
259 | } | 260 | } |
260 | 261 | ||
261 | # TODO: Currently BBPATH is needed for custom loading of targets. | 262 | # TODO: Currently BBPATH is needed for custom loading of targets. |
diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py index 758703c0d1..008a9f03ce 100644 --- a/meta/lib/oeqa/core/target/qemu.py +++ b/meta/lib/oeqa/core/target/qemu.py | |||
@@ -18,7 +18,7 @@ class OEQemuTarget(OESSHTarget): | |||
18 | def __init__(self, logger, server_ip, timeout=300, user='root', | 18 | def __init__(self, logger, server_ip, timeout=300, user='root', |
19 | port=None, machine='', rootfs='', kernel='', kvm=False, slirp=False, | 19 | port=None, machine='', rootfs='', kernel='', kvm=False, slirp=False, |
20 | dump_dir='', dump_host_cmds='', display='', bootlog='', | 20 | dump_dir='', dump_host_cmds='', display='', bootlog='', |
21 | tmpdir='', dir_image='', boottime=60, **kwargs): | 21 | tmpdir='', dir_image='', boottime=60, serial_ports=2, **kwargs): |
22 | 22 | ||
23 | super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout, | 23 | super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout, |
24 | user, port) | 24 | user, port) |
@@ -35,7 +35,8 @@ class OEQemuTarget(OESSHTarget): | |||
35 | deploy_dir_image=dir_image, display=display, | 35 | deploy_dir_image=dir_image, display=display, |
36 | logfile=bootlog, boottime=boottime, | 36 | logfile=bootlog, boottime=boottime, |
37 | use_kvm=kvm, use_slirp=slirp, dump_dir=dump_dir, | 37 | use_kvm=kvm, use_slirp=slirp, dump_dir=dump_dir, |
38 | dump_host_cmds=dump_host_cmds, logger=logger) | 38 | dump_host_cmds=dump_host_cmds, logger=logger, |
39 | serial_ports=serial_ports) | ||
39 | 40 | ||
40 | def start(self, params=None, extra_bootparams=None, runqemuparams=''): | 41 | def start(self, params=None, extra_bootparams=None, runqemuparams=''): |
41 | if self.use_slirp and not self.server_ip: | 42 | if self.use_slirp and not self.server_ip: |