diff options
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r-- | meta/lib/oeqa/runtime/cases/weston.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/runtime/cases/weston.py b/meta/lib/oeqa/runtime/cases/weston.py index b3a7c2776d..b81cc299ef 100644 --- a/meta/lib/oeqa/runtime/cases/weston.py +++ b/meta/lib/oeqa/runtime/cases/weston.py | |||
@@ -10,7 +10,7 @@ import threading | |||
10 | import time | 10 | import time |
11 | 11 | ||
12 | class WestonTest(OERuntimeTestCase): | 12 | class WestonTest(OERuntimeTestCase): |
13 | weston_log_file = '/tmp/weston.log' | 13 | weston_log_file = '/tmp/weston-2.log' |
14 | 14 | ||
15 | @classmethod | 15 | @classmethod |
16 | def tearDownClass(cls): | 16 | def tearDownClass(cls): |
@@ -31,13 +31,13 @@ class WestonTest(OERuntimeTestCase): | |||
31 | return output.split(" ") | 31 | return output.split(" ") |
32 | 32 | ||
33 | def get_weston_command(self, cmd): | 33 | def get_weston_command(self, cmd): |
34 | return 'export XDG_RUNTIME_DIR=/run/user/0; export WAYLAND_DISPLAY=wayland-0; %s' % cmd | 34 | return 'export XDG_RUNTIME_DIR=/run/user/`id -u weston`; export WAYLAND_DISPLAY=wayland-1; %s' % cmd |
35 | 35 | ||
36 | def run_weston_init(self): | 36 | def run_weston_init(self): |
37 | if 'systemd' in self.tc.td['VIRTUAL-RUNTIME_init_manager']: | 37 | if 'systemd' in self.tc.td['VIRTUAL-RUNTIME_init_manager']: |
38 | self.target.run('systemd-run --collect --unit=weston-ptest.service --uid=0 -p PAMName=login -p TTYPath=/dev/tty6 -E XDG_RUNTIME_DIR=/tmp -E WAYLAND_DISPLAY=wayland-0 /usr/bin/weston --socket=wayland-1 --log=%s' % self.weston_log_file) | 38 | self.target.run('systemd-run --collect --unit=weston-ptest.service --uid=0 -p PAMName=login -p TTYPath=/dev/tty6 -E XDG_RUNTIME_DIR=/tmp -E WAYLAND_DISPLAY=wayland-0 /usr/bin/weston --socket=wayland-1 --log=%s' % self.weston_log_file) |
39 | else: | 39 | else: |
40 | self.target.run(self.get_weston_command('openvt -- weston --socket=wayland-1 --log=%s' % self.weston_log_file)) | 40 | self.target.run(self.get_weston_command('openvt -- weston --socket=wayland-2 --log=%s' % self.weston_log_file)) |
41 | 41 | ||
42 | def get_new_wayland_processes(self, existing_wl_processes): | 42 | def get_new_wayland_processes(self, existing_wl_processes): |
43 | try_cnt = 0 | 43 | try_cnt = 0 |