* [PATCH 1/2] oeqa/weston: Fix tests to run with systemd
@ 2020-09-13 4:49 Khem Raj
2020-09-13 4:49 ` [PATCH 2/2] core-image-weston: Bump qemu memory to 512M Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2020-09-13 4:49 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Currently, weston tests fail when using systemd, fix it by providing
transient unit file and inject it via systemd-run, which generates a
service file automatically and launches another weston instance to test
if it can launch a nested instance. Use systemctl stop to end the
service and cleanup, instead of brutal kill
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/lib/oeqa/runtime/cases/weston.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oeqa/runtime/cases/weston.py b/meta/lib/oeqa/runtime/cases/weston.py
index ac29eca6e4..691524a92b 100644
--- a/meta/lib/oeqa/runtime/cases/weston.py
+++ b/meta/lib/oeqa/runtime/cases/weston.py
@@ -34,7 +34,10 @@ class WestonTest(OERuntimeTestCase):
return 'export XDG_RUNTIME_DIR=/run/user/0; export WAYLAND_DISPLAY=wayland-0; %s' % cmd
def run_weston_init(self):
- self.target.run(self.get_weston_command('weston --log=%s' % self.weston_log_file))
+ if 'systemd' in self.tc.td['DISTRO_FEATURES']:
+ 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-1 /usr/bin/weston --socket=wayland-1 --log=%s' % self.weston_log_file)
+ else:
+ self.target.run(self.get_weston_command('weston --log=%s' % self.weston_log_file))
def get_new_wayland_processes(self, existing_wl_processes):
try_cnt = 0
@@ -63,7 +66,10 @@ class WestonTest(OERuntimeTestCase):
new_wl_processes, try_cnt = self.get_new_wayland_processes(existing_wl_processes)
existing_and_new_weston_processes = self.get_processes_of('weston', 'existing and new')
new_weston_processes = [x for x in existing_and_new_weston_processes if x not in existing_weston_processes]
- for w in new_weston_processes:
- self.target.run('kill -9 %s' % w)
+ if 'systemd' in self.tc.td['DISTRO_FEATURES']:
+ self.target.run('systemctl stop weston-ptest.service')
+ else:
+ for w in new_weston_processes:
+ self.target.run('kill -9 %s' % w)
__, weston_log = self.target.run('cat %s' % self.weston_log_file)
self.assertTrue(new_wl_processes, msg='Could not get new weston-desktop-shell processes (%s, try_cnt:%s) weston log: %s' % (new_wl_processes, try_cnt, weston_log))
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] core-image-weston: Bump qemu memory to 512M
2020-09-13 4:49 [PATCH 1/2] oeqa/weston: Fix tests to run with systemd Khem Raj
@ 2020-09-13 4:49 ` Khem Raj
2020-09-13 11:58 ` [OE-core] " Richard Purdie
0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2020-09-13 4:49 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
It needs openGL and launching two weston instances during weston ptest
needs > 256M ram to work
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-graphics/images/core-image-weston.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-graphics/images/core-image-weston.bb b/meta/recipes-graphics/images/core-image-weston.bb
index f5102e1989..fa7e9ef421 100644
--- a/meta/recipes-graphics/images/core-image-weston.bb
+++ b/meta/recipes-graphics/images/core-image-weston.bb
@@ -10,3 +10,5 @@ REQUIRED_DISTRO_FEATURES = "wayland"
CORE_IMAGE_BASE_INSTALL += "weston weston-init weston-examples gtk+3-demo clutter-1.0-examples"
CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland matchbox-terminal', '', d)}"
+
+QB_MEM = "-m 512"
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH 2/2] core-image-weston: Bump qemu memory to 512M
2020-09-13 4:49 ` [PATCH 2/2] core-image-weston: Bump qemu memory to 512M Khem Raj
@ 2020-09-13 11:58 ` Richard Purdie
0 siblings, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2020-09-13 11:58 UTC (permalink / raw)
To: Khem Raj, openembedded-core
Hi Khem,
On Sat, 2020-09-12 at 21:49 -0700, Khem Raj wrote:
> It needs openGL and launching two weston instances during weston
> ptest
> needs > 256M ram to work
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta/recipes-graphics/images/core-image-weston.bb | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/meta/recipes-graphics/images/core-image-weston.bb
> b/meta/recipes-graphics/images/core-image-weston.bb
> index f5102e1989..fa7e9ef421 100644
> --- a/meta/recipes-graphics/images/core-image-weston.bb
> +++ b/meta/recipes-graphics/images/core-image-weston.bb
> @@ -10,3 +10,5 @@ REQUIRED_DISTRO_FEATURES = "wayland"
>
> CORE_IMAGE_BASE_INSTALL += "weston weston-init weston-examples
> gtk+3-demo clutter-1.0-examples"
> CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES',
> 'x11', 'weston-xwayland matchbox-terminal', '', d)}"
> +
> +QB_MEM = "-m 512"
One of the weston patches seems to be causing:
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/2458
(no-x11 build)
Cheers,
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-13 11:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-13 4:49 [PATCH 1/2] oeqa/weston: Fix tests to run with systemd Khem Raj
2020-09-13 4:49 ` [PATCH 2/2] core-image-weston: Bump qemu memory to 512M Khem Raj
2020-09-13 11:58 ` [OE-core] " Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.