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-25 22:27:45 +0000 |
commit | 33504386a32b95bc25c32715564fbb8d12fcdf30 (patch) | |
tree | 5754618d67db82f801542317b6dcec92724557e8 /meta | |
parent | 07b748ba62b5471d012ab7d0f406ddeb8bcd4ff6 (diff) | |
download | poky-33504386a32b95bc25c32715564fbb8d12fcdf30.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: 9d8a97b43c42b87c56d3b2ac318cb5482e86c397)
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')
-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 20dbe8ddd7..e01ceedf61 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass | |||
@@ -284,18 +284,12 @@ def testimage_main(d): | |||
284 | 284 | ||
285 | package_extraction(d, tc.suites) | 285 | package_extraction(d, tc.suites) |
286 | 286 | ||
287 | bootparams = None | ||
288 | if d.getVar('VIRTUAL-RUNTIME_init_manager', '') == 'systemd': | ||
289 | # Add systemd.log_level=debug to enable systemd debug logging | ||
290 | bootparams = 'systemd.log_target=console' | ||
291 | |||
292 | results = None | 287 | results = None |
293 | orig_sigterm_handler = signal.signal(signal.SIGTERM, sigterm_exception) | 288 | orig_sigterm_handler = signal.signal(signal.SIGTERM, sigterm_exception) |
294 | try: | 289 | try: |
295 | # We need to check if runqemu ends unexpectedly | 290 | # We need to check if runqemu ends unexpectedly |
296 | # or if the worker send us a SIGTERM | 291 | # or if the worker send us a SIGTERM |
297 | tc.target.start(params=d.getVar("TEST_QEMUPARAMS"), | 292 | tc.target.start(params=d.getVar("TEST_QEMUPARAMS")) |
298 | extra_bootparams=bootparams) | ||
299 | results = tc.runTests() | 293 | results = tc.runTests() |
300 | except (RuntimeError, BlockingIOError) as err: | 294 | except (RuntimeError, BlockingIOError) as err: |
301 | if isinstance(err, RuntimeError): | 295 | if isinstance(err, RuntimeError): |