summaryrefslogtreecommitdiffstats
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:46:37 +0100
commitf49e4847ba00cdd072e5f072cb9ca69ef98af758 (patch)
treeb22ef33aaa5b37131c3c3d2af947cf68a6a56d14
parenta0bb64973e767c3b8e0bae18ee84ed92693922f0 (diff)
downloadopenembedded-core-contrib-f49e4847ba00cdd072e5f072cb9ca69ef98af758.tar.gz
openembedded-core-contrib-f49e4847ba00cdd072e5f072cb9ca69ef98af758.tar.bz2
openembedded-core-contrib-f49e4847ba00cdd072e5f072cb9ca69ef98af758.zip
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 Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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):
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)