[oe-commits] [openembedded-core] 04/08: oeqa/runtime/syslog: test_syslog_logger Don't try to use logread when systemd is enabled

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 186310df220ab7634fe9cb1854bf6ea7eeab1523
Author: Aníbal Limón <anibal.limon at linux.intel.com>
AuthorDate: 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
    
    Signed-off-by: Aníbal Limón <anibal.limon at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/lib/oeqa/runtime/syslog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.