diff options
author | Kai Kang <kai.kang@windriver.com> | 2018-12-25 04:39:43 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-06 16:38:30 +0000 |
commit | 7de83fe2ed1ca4c33c400b14acae5efee2371c29 (patch) | |
tree | c6e6284116b6a434b4506e586e6b70fc7b936377 /meta/classes/testimage.bbclass | |
parent | b8ab2f0c1799fbe761d9aea03b3e5a9dd654e542 (diff) | |
download | poky-7de83fe2ed1ca4c33c400b14acae5efee2371c29.tar.gz |
testimage.bbclass: remove boot parameter systemd.log_target
Boot parameter systemd.log_target=console affects command journalctl's
output and causes oe selftest case test_systemd_boot_time fail to pass.
| Error at obtaining the boot time from journalctl
| RESULTS:
| RESULTS - systemd.SystemdJournalTests.test_systemd_boot_time - Testcase -1: SKIPPED (0.74s)
systemd.log_target=console was introduced by oe-core commit a0bb649 and
work with parameter systemd.log_level to enable systemd debug.
systemd.log_level has been removed already, so remove systemd.log_target
too to make case test_systemd_boot_time pass.
(From OE-Core rev: caa776bdcf8ea34c857f45970370bf771075f4bc)
(From OE-Core rev: 51423c3945d55ebabe38dd365d24f226155c1a97)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/testimage.bbclass')
-rw-r--r-- | meta/classes/testimage.bbclass | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index ed82a56ae3..43a0abaec2 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass | |||
@@ -287,18 +287,12 @@ def testimage_main(d): | |||
287 | 287 | ||
288 | package_extraction(d, tc.suites) | 288 | package_extraction(d, tc.suites) |
289 | 289 | ||
290 | bootparams = None | ||
291 | if d.getVar('VIRTUAL-RUNTIME_init_manager', '') == 'systemd': | ||
292 | # Add systemd.log_level=debug to enable systemd debug logging | ||
293 | bootparams = 'systemd.log_target=console' | ||
294 | |||
295 | results = None | 290 | results = None |
296 | orig_sigterm_handler = signal.signal(signal.SIGTERM, sigterm_exception) | 291 | orig_sigterm_handler = signal.signal(signal.SIGTERM, sigterm_exception) |
297 | try: | 292 | try: |
298 | # We need to check if runqemu ends unexpectedly | 293 | # We need to check if runqemu ends unexpectedly |
299 | # or if the worker send us a SIGTERM | 294 | # or if the worker send us a SIGTERM |
300 | tc.target.start(params=d.getVar("TEST_QEMUPARAMS"), | 295 | tc.target.start(params=d.getVar("TEST_QEMUPARAMS")) |
301 | extra_bootparams=bootparams) | ||
302 | results = tc.runTests() | 296 | results = tc.runTests() |
303 | except (RuntimeError, BlockingIOError) as err: | 297 | except (RuntimeError, BlockingIOError) as err: |
304 | if isinstance(err, RuntimeError): | 298 | if isinstance(err, RuntimeError): |