tests: migrate devices

The devices test was actually using the defaults instead of
weston-test-desktop-shell in meson.build, so this patch keeps it that way.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2019-11-13 15:35:22 +02:00 committed by Daniel Stone
parent af18eb0b5c
commit 3fb67936a9
2 changed files with 13 additions and 3 deletions

View file

@ -27,6 +27,18 @@
#include <string.h>
#include "weston-test-client-helper.h"
#include "weston-test-fixture-compositor.h"
static enum test_result_code
fixture_setup(struct weston_test_harness *harness)
{
struct compositor_setup setup;
compositor_setup_defaults(&setup);
return weston_test_harness_execute_as_client(harness, &setup);
}
DECLARE_FIXTURE_SETUP(fixture_setup);
/**
* Test (un)plugging devices
@ -40,8 +52,6 @@
WL_SEAT_CAPABILITY_POINTER |\
WL_SEAT_CAPABILITY_TOUCH)
char *server_parameters = "--shell=weston-test-desktop-shell.so";
/* simply test if weston sends the right capabilities when
* some devices are removed */
TEST(seat_capabilities_test)

View file

@ -111,6 +111,7 @@ dep_zucmain = declare_dependency(
)
tests = [
{ 'name': 'devices', },
{ 'name': 'internal-screenshot', },
{ 'name': 'plugin-registry', },
{ 'name': 'roles', },
@ -139,7 +140,6 @@ tests_standalone = [
tests_weston = [
['bad-buffer'],
['devices'],
['event'],
[
'keyboard',