aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test-compositor.c
diff options
context:
space:
mode:
authorDaniel Stone <daniels@collabora.com>2018-08-24 16:15:59 +0100
committerDaniel Stone <daniels@collabora.com>2018-08-29 09:59:04 +0100
commit01095a9ce4d8457ee2f221848b9805c4b5cffc95 (patch)
treedfa779d52afab16678141766a5d7ad7c4eefd692 /tests/test-compositor.c
parenttests: Overly elaborate compiler warning workaround (diff)
downloadwayland-01095a9ce4d8457ee2f221848b9805c4b5cffc95.tar
wayland-01095a9ce4d8457ee2f221848b9805c4b5cffc95.tar.gz
wayland-01095a9ce4d8457ee2f221848b9805c4b5cffc95.tar.bz2
wayland-01095a9ce4d8457ee2f221848b9805c4b5cffc95.tar.lz
wayland-01095a9ce4d8457ee2f221848b9805c4b5cffc95.tar.xz
wayland-01095a9ce4d8457ee2f221848b9805c4b5cffc95.tar.zst
wayland-01095a9ce4d8457ee2f221848b9805c4b5cffc95.zip
tests: Remove memory leak checking infrastructure
There are far better ways to detect memory leaks, such as either valgrind or ASan. Having Meson makes it really easy to use these tools in our tests, and we can do that in CI as well. Having these local wrappers actually completely broke ASan usage, so remove them in favour of using the more powerful options. Signed-off-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'tests/test-compositor.c')
-rw-r--r--tests/test-compositor.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/test-compositor.c b/tests/test-compositor.c
index 0631f61..72f6351 100644
--- a/tests/test-compositor.c
+++ b/tests/test-compositor.c
@@ -156,7 +156,7 @@ run_client(void (*client_main)(void *data), void *data,
int wayland_sock, int client_pipe)
{
char s[8];
- int cur_alloc, cur_fds;
+ int cur_fds;
int can_continue = 0;
/* Wait until display signals that client can continue */
@@ -169,7 +169,6 @@ run_client(void (*client_main)(void *data), void *data,
snprintf(s, sizeof s, "%d", wayland_sock);
setenv("WAYLAND_SOCKET", s, 0);
- cur_alloc = get_current_alloc_num();
cur_fds = count_open_fds();
client_main(data);
@@ -182,7 +181,7 @@ run_client(void (*client_main)(void *data), void *data,
if (!getenv("WAYLAND_SOCKET"))
cur_fds--;
- check_leaks(cur_alloc, cur_fds);
+ check_fd_leaks(cur_fds);
}
static struct client_info *