mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-03-20 05:34:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: Pass argument to client main

Browse source 
Change the API to pass an "void *" argument to the client main
function, allowing the caller to call the same main function with
different input.

A helper (client_create_noarg) is added for when no argument is passed,
and the existing test cases are changed to use this function instead.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Jonas Ådahl 2015-12-28 11:25:00 +08:00
parent 7efe8fbd89
commit 046012a6cf
6 changed files with 45 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/display-test.c
View file

@ -95,7 +95,7 @@ empty_client(void)
TEST(tc_leaks_tests)
{
struct display *d = display_create();
client_create(d, empty_client);
client_create_noarg(d, empty_client);
display_run(d);
display_destroy(d);
}
@ -209,7 +209,7 @@ TEST(post_error_to_one_client)
wl_global_create(d->wl_display, &wl_seat_interface,
1, d, bind_seat);
cl = client_create(d, post_error_main);
cl = client_create_noarg(d, post_error_main);
display_run(d);
/* the display was stopped by client, so it can
@ -264,8 +264,8 @@ TEST(post_error_to_one_from_two_clients)
wl_global_create(d->wl_display, &wl_seat_interface,
1, d, bind_seat);
client_create(d, post_error_main2);
cl = client_create(d, post_error_main3);
client_create_noarg(d, post_error_main2);
cl = client_create_noarg(d, post_error_main3);
display_run(d);
/* post error only to the second client */
@ -289,8 +289,8 @@ TEST(post_error_to_two_clients)
wl_global_create(d->wl_display, &wl_seat_interface,
1, d, bind_seat);
cl = client_create(d, post_error_main3);
cl2 = client_create(d, post_error_main3);
cl = client_create_noarg(d, post_error_main3);
cl2 = client_create_noarg(d, post_error_main3);
display_run(d);
@ -331,7 +331,7 @@ TEST(post_nomem_tst)
wl_global_create(d->wl_display, &wl_seat_interface,
1, d, bind_seat);
cl = client_create(d, post_nomem_main);
cl = client_create_noarg(d, post_nomem_main);
display_run(d);
assert(cl->data);
@ -340,7 +340,7 @@ TEST(post_nomem_tst)
/* first client terminated. Run it again,
* but post no memory to client */
cl = client_create(d, post_nomem_main);
cl = client_create_noarg(d, post_nomem_main);
display_run(d);
assert(cl->data);
@ -447,7 +447,7 @@ TEST(threading_errors_tst)
{
struct display *d = display_create();
client_create(d, threading_post_err);
client_create_noarg(d, threading_post_err);
display_run(d);
display_destroy(d);
@ -502,7 +502,7 @@ TEST(threading_cancel_read_tst)
{
struct display *d = display_create();
client_create(d, threading_cancel_read);
client_create_noarg(d, threading_cancel_read);
display_run(d);
display_destroy(d);
@ -542,7 +542,7 @@ threading_read_eagain(void)
TEST(threading_read_eagain_tst)
{
struct display *d = display_create();
client_create(d, threading_read_eagain);
client_create_noarg(d, threading_read_eagain);
display_run(d);
@ -604,7 +604,7 @@ TEST(threading_read_after_error_tst)
{
struct display *d = display_create();
client_create(d, threading_read_after_error);
client_create_noarg(d, threading_read_after_error);
display_run(d);
display_destroy(d);