mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -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

20
tests/sanity-test.c
View file

@ -119,7 +119,7 @@ FAIL_TEST(sanity_malloc_indirect)
FAIL_TEST(tc_client_memory_leaks)
{
struct display *d = display_create();
client_create(d, sanity_malloc_direct);
client_create_noarg(d, sanity_malloc_direct);
display_run(d);
display_destroy(d);
}
@ -127,7 +127,7 @@ FAIL_TEST(tc_client_memory_leaks)
FAIL_TEST(tc_client_memory_leaks2)
{
struct display *d = display_create();
client_create(d, sanity_malloc_indirect);
client_create_noarg(d, sanity_malloc_indirect);
display_run(d);
display_destroy(d);
}
@ -195,11 +195,11 @@ TEST(tc_client_no_fd_leaks)
struct display *d = display_create();
/* Client which does not consume the WAYLAND_DISPLAY socket. */
client_create(d, sanity_fd_no_leak);
client_create_noarg(d, sanity_fd_no_leak);
display_run(d);
/* Client which does consume the WAYLAND_DISPLAY socket. */
client_create(d, sanity_client_no_leak);
client_create_noarg(d, sanity_client_no_leak);
display_run(d);
display_destroy(d);
@ -209,7 +209,7 @@ FAIL_TEST(tc_client_fd_leaks)
{
struct display *d = display_create();
client_create(d, sanity_fd_leak);
client_create_noarg(d, sanity_fd_leak);
display_run(d);
display_destroy(d);
@ -219,7 +219,7 @@ FAIL_TEST(tc_client_fd_leaks_exec)
{
struct display *d = display_create();
client_create(d, sanity_fd_leak);
client_create_noarg(d, sanity_fd_leak);
display_run(d);
display_destroy(d);
@ -263,7 +263,7 @@ TEST(timeout_turnoff)
FAIL_TEST(tc_timeout_tst)
{
struct display *d = display_create();
client_create(d, timeout_tst);
client_create_noarg(d, timeout_tst);
display_run(d);
display_destroy(d);
}
@ -271,7 +271,7 @@ FAIL_TEST(tc_timeout_tst)
FAIL_TEST(tc_timeout2_tst)
{
struct display *d = display_create();
client_create(d, timeout_reset_tst);
client_create_noarg(d, timeout_reset_tst);
display_run(d);
display_destroy(d);
}
@ -280,10 +280,10 @@ TEST(tc_timeout3_tst)
{
struct display *d = display_create();
client_create(d, timeout2_tst);
client_create_noarg(d, timeout2_tst);
display_run(d);
client_create(d, timeout_turnoff);
client_create_noarg(d, timeout_turnoff);
display_run(d);
display_destroy(d);