[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1633/8267] oeqa/runtime/syslog: test_syslog_logger Don't try to use logread when systemd is enabled
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 1633/8267] oeqa/runtime/syslog: test_syslog_logger Don't try to use logread when systemd is enabled
- Date: Sat, 16 Dec 2017 22:06:03 +0000 (UTC)
commit 16485041989453aa8f847c44f68f1d6a085ab0fa
Author: Aníbal Limón <anibal limon linux intel com>
Date: Wed Jul 27 17:40:41 2016 -0500
oeqa/runtime/syslog: test_syslog_logger Don't try to use logread when systemd is enabled
Busybox logread uses shmmem circular buffer to retrive [1] syslog messages
when systemd is enabled this shmem circular buffer isn't enabled because
systemd journald doesn't provide it.
[1]
https://git.busybox.net/busybox/tree/sysklogd/logread.c?id=accd9eeb719916da974584b33b1aeced5f3bb346#n121
(From OE-Core rev: f49e4847ba00cdd072e5f072cb9ca69ef98af758)
Signed-off-by: Aníbal Limón <anibal limon linux intel com>
Signed-off-by: Ross Burton <ross burton intel com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
meta/lib/oeqa/runtime/syslog.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/lib/oeqa/runtime/syslog.py b/meta/lib/oeqa/runtime/syslog.py
index 202a63f..cce3c22 100644
--- a/meta/lib/oeqa/runtime/syslog.py
+++ b/meta/lib/oeqa/runtime/syslog.py
@@ -22,7 +22,7 @@ class SyslogTestConfig(oeRuntimeTest):
self.assertEqual(status, 0, msg="Can't log into syslog. Output: %s " % output)
(status, output) = self.target.run('grep foobar /var/log/messages')
- if status != 0:
+ if status != 0 and not oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager", "") == "systemd":
(status, output) = self.target.run('logread | grep foobar')
self.assertEqual(status, 0, msg="Test log string not found in /var/log/messages or logread. Output:
%s " % output)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]