summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-03-03 14:06:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-04 00:08:06 +0000
commit0cd91da3175301b0ff66ea0da109b08355e7f80a (patch)
treebbde6b6e98389c5a17a4b2148eb34fc54ac3cf07
parent4fc6a202f6df0d4d288874acd7f58bc852c273d2 (diff)
downloadopenembedded-core-master-next.tar.gz
openembedded-core-master-next.tar.bz2
openembedded-core-master-next.zip
oeqa/weston: correctly run wayland-info when systemd is in usemaster-next
Under systemd weston's socket is in /run, not in /run/user/0. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/runtime/cases/weston.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/lib/oeqa/runtime/cases/weston.py b/meta/lib/oeqa/runtime/cases/weston.py
index a1c7183213..b3a7c2776d 100644
--- a/meta/lib/oeqa/runtime/cases/weston.py
+++ b/meta/lib/oeqa/runtime/cases/weston.py
@@ -53,7 +53,11 @@ class WestonTest(OERuntimeTestCase):
@OEHasPackage(['wayland-utils'])
def test_wayland_info(self):
- status, output = self.target.run(self.get_weston_command('wayland-info'))
+ if 'systemd' in self.tc.td['VIRTUAL-RUNTIME_init_manager']:
+ command = 'XDG_RUNTIME_DIR=/run wayland-info'
+ else:
+ command = self.get_weston_command('wayland-info')
+ status, output = self.target.run(command)
self.assertEqual(status, 0, msg='wayland-info error: %s' % output)
@OEHasPackage(['weston'])