diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-03-03 14:06:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-06 22:39:04 +0000 |
commit | 750293518de0fb57f302f68c4c4b839494b56546 (patch) | |
tree | 32709174c496a8da40678b4fd3890139b5b32c5b /meta | |
parent | d8b2c8cee92b3200e9d78daf27b83d03ecc21108 (diff) | |
download | poky-750293518de0fb57f302f68c4c4b839494b56546.tar.gz |
oeqa/weston: correctly run wayland-info when systemd is in use
Under systemd weston's socket is in /run, not in /run/user/0.
(From OE-Core rev: ea7dfd857ce3779745dccda0cbfd93b5e5de1a36)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/runtime/cases/weston.py | 6 |
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): | |||
53 | 53 | ||
54 | @OEHasPackage(['wayland-utils']) | 54 | @OEHasPackage(['wayland-utils']) |
55 | def test_wayland_info(self): | 55 | def test_wayland_info(self): |
56 | status, output = self.target.run(self.get_weston_command('wayland-info')) | 56 | if 'systemd' in self.tc.td['VIRTUAL-RUNTIME_init_manager']: |
57 | command = 'XDG_RUNTIME_DIR=/run wayland-info' | ||
58 | else: | ||
59 | command = self.get_weston_command('wayland-info') | ||
60 | status, output = self.target.run(command) | ||
57 | self.assertEqual(status, 0, msg='wayland-info error: %s' % output) | 61 | self.assertEqual(status, 0, msg='wayland-info error: %s' % output) |
58 | 62 | ||
59 | @OEHasPackage(['weston']) | 63 | @OEHasPackage(['weston']) |