diff options
author | Kai Kang <kai.kang@windriver.com> | 2018-12-25 04:39:43 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-27 22:52:58 +0000 |
commit | a32c80e6f0658dab6bae4116fc826276bb131404 (patch) | |
tree | f66f7e28890ea2d7647282505f811aad2ae33c3e /meta/classes | |
parent | a50f80aef0bad5cea0d7d0f64a6dd0bdad1c6fd4 (diff) | |
download | poky-a32c80e6f0658dab6bae4116fc826276bb131404.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)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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 8a15c30c79..e8fa4a3b32 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass | |||
@@ -293,18 +293,12 @@ def testimage_main(d): | |||
293 | 293 | ||
294 | package_extraction(d, tc.suites) | 294 | package_extraction(d, tc.suites) |
295 | 295 | ||
296 | bootparams = None | ||
297 | if d.getVar('VIRTUAL-RUNTIME_init_manager', '') == 'systemd': | ||
298 | # Add systemd.log_level=debug to enable systemd debug logging | ||
299 | bootparams = 'systemd.log_target=console' | ||
300 | |||
301 | results = None | 296 | results = None |
302 | orig_sigterm_handler = signal.signal(signal.SIGTERM, sigterm_exception) | 297 | orig_sigterm_handler = signal.signal(signal.SIGTERM, sigterm_exception) |
303 | try: | 298 | try: |
304 | # We need to check if runqemu ends unexpectedly | 299 | # We need to check if runqemu ends unexpectedly |
305 | # or if the worker send us a SIGTERM | 300 | # or if the worker send us a SIGTERM |
306 | tc.target.start(params=d.getVar("TEST_QEMUPARAMS"), | 301 | tc.target.start(params=d.getVar("TEST_QEMUPARAMS")) |
307 | extra_bootparams=bootparams) | ||
308 | results = tc.runTests() | 302 | results = tc.runTests() |
309 | except (RuntimeError, BlockingIOError) as err: | 303 | except (RuntimeError, BlockingIOError) as err: |
310 | if isinstance(err, RuntimeError): | 304 | if isinstance(err, RuntimeError): |