system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-09-20 23:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: remove static data from ivi-layout-test-plugin

Browse source 
I cannot see any reason why this should be static data. But if it is static
data, it will prevent re-entering wet_main() to run tests with this plugin, so
replace it with "normal" data.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2019-11-05 16:32:18 +02:00 committed by Daniel Stone
parent 4058828b54
commit d19c55c75e
1 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
tests/ivi-layout-test-plugin.c
View file

@ -76,13 +76,6 @@ find_runner_test(const char *name)
return NULL;
}
struct test_launcher {
struct weston_compositor *compositor;
char exe[2048];
struct weston_process process;
const struct ivi_layout_interface *layout_interface;
};
struct test_context {
const struct ivi_layout_interface *layout_interface;
struct wl_resource *runner_resource;
@ -94,16 +87,25 @@ struct test_context {
struct wl_listener surface_configured;
};
static struct test_context static_context;
struct test_launcher {
struct weston_compositor *compositor;
struct test_context context;
char exe[2048];
struct weston_process process;
const struct ivi_layout_interface *layout_interface;
};
static void
destroy_runner(struct wl_resource *resource)
{
assert(static_context.runner_resource == NULL ||
static_context.runner_resource == resource);
struct test_launcher *launcher = wl_resource_get_user_data(resource);
struct test_context *ctx = &launcher->context;
static_context.layout_interface = NULL;
static_context.runner_resource = NULL;
assert(ctx->runner_resource == NULL ||
ctx->runner_resource == resource);
ctx->layout_interface = NULL;
ctx->runner_resource = NULL;
}
static void
@ -118,13 +120,16 @@ runner_run_handler(struct wl_client *client, struct wl_resource *resource,
{
struct test_launcher *launcher;
const struct runner_test *t;
assert(static_context.runner_resource == NULL ||
static_context.runner_resource == resource);
struct test_context *ctx;
launcher = wl_resource_get_user_data(resource);
static_context.layout_interface = launcher->layout_interface;
static_context.runner_resource = resource;
ctx = &launcher->context;
assert(ctx->runner_resource == NULL ||
ctx->runner_resource == resource);
ctx->layout_interface = launcher->layout_interface;
ctx->runner_resource = resource;
t = find_runner_test(test_name);
if (!t) {
@ -139,7 +144,7 @@ runner_run_handler(struct wl_client *client, struct wl_resource *resource,
weston_log("weston_test_runner.run(\"%s\")\n", test_name);
t->run(&static_context);
t->run(ctx);
weston_test_runner_send_finished(resource);
}
@ -166,7 +171,7 @@ bind_runner(struct wl_client *client, void *data,
wl_resource_set_implementation(resource, &runner_implementation,
launcher, destroy_runner);
if (static_context.runner_resource != NULL) {
if (launcher->context.runner_resource != NULL) {
weston_log("test FATAL: "
"attempting to run several tests in parallel.\n");
wl_resource_post_error(resource,