summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2016-07-27 17:40:41 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-01 11:47:13 +0100
commit16485041989453aa8f847c44f68f1d6a085ab0fa (patch)
treea3d206f6dd8690eb8008a136f436711b5250636b /meta/lib
parenta86a1b2703372c12e7fca18918695d093ea6ee53 (diff)
downloadpoky-16485041989453aa8f847c44f68f1d6a085ab0fa.tar.gz
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>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/runtime/syslog.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/runtime/syslog.py b/meta/lib/oeqa/runtime/syslog.py
index 202a63f2af..cce3c221d6 100644
--- a/meta/lib/oeqa/runtime/syslog.py
+++ b/meta/lib/oeqa/runtime/syslog.py
@@ -22,7 +22,7 @@ class SyslogTestConfig(oeRuntimeTest):
22 self.assertEqual(status, 0, msg="Can't log into syslog. Output: %s " % output) 22 self.assertEqual(status, 0, msg="Can't log into syslog. Output: %s " % output)
23 23
24 (status, output) = self.target.run('grep foobar /var/log/messages') 24 (status, output) = self.target.run('grep foobar /var/log/messages')
25 if status != 0: 25 if status != 0 and not oeRuntimeTest.tc.d.getVar("VIRTUAL-RUNTIME_init_manager", "") == "systemd":
26 (status, output) = self.target.run('logread | grep foobar') 26 (status, output) = self.target.run('logread | grep foobar')
27 self.assertEqual(status, 0, msg="Test log string not found in /var/log/messages or logread. Output: %s " % output) 27 self.assertEqual(status, 0, msg="Test log string not found in /var/log/messages or logread. Output: %s " % output)
28 28