diff options
author | Marek Chalupa <mchqwerty@gmail.com> | 2014-12-19 14:53:06 +0100 |
---|---|---|
committer | Daniel Stone <daniels@collabora.com> | 2015-01-28 17:17:22 +0000 |
commit | 68c11c48c0f2bff69a10af503238cbf5d07a5df0 (patch) | |
tree | 77e5b5ccc6b1cccd5c283eb73d317181163c2dce | |
parent | 5c70c031903352530f701ca4badf4be1763984a4 (diff) |
tests: add possibility to disable leak check for single test
In tests that are using external libraries (i. e. pthread) we
can get failure because of leaks in the external library.
Until we have some better solution (if ever), let these (and only these)
tests to disable leak checks.
Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
-rw-r--r-- | tests/sanity-test.c | 13 | ||||
-rw-r--r-- | tests/test-runner.c | 2 | ||||
-rw-r--r-- | tests/test-runner.h | 6 |
3 files changed, 21 insertions, 0 deletions
diff --git a/tests/sanity-test.c b/tests/sanity-test.c index a61dc99..b5a6fae 100644 --- a/tests/sanity-test.c +++ b/tests/sanity-test.c @@ -81,6 +81,19 @@ FAIL_TEST(sanity_malloc_direct) free(NULL); /* NULL must not be counted */ } +TEST(disable_leak_checks) +{ + volatile void *mem; + assert(leak_check_enabled); + /* normally this should be on the beginning of the test. + * Here we need to be sure, that the leak checks are + * turned on */ + DISABLE_LEAK_CHECKS; + + mem = malloc(16); + assert(mem); +} + FAIL_TEST(sanity_malloc_indirect) { struct wl_array array; diff --git a/tests/test-runner.c b/tests/test-runner.c index 2e6ad33..70fa0ae 100644 --- a/tests/test-runner.c +++ b/tests/test-runner.c @@ -175,6 +175,8 @@ check_leaks(int supposed_alloc, int supposed_fds) num_fds - supposed_fds); abort(); } + } else { + fprintf(stderr, "Leak checks disabled\n"); } } diff --git a/tests/test-runner.h b/tests/test-runner.h index 5963ab6..6054da5 100644 --- a/tests/test-runner.h +++ b/tests/test-runner.h @@ -62,4 +62,10 @@ test_usleep(useconds_t); void test_sleep(unsigned int); +#define DISABLE_LEAK_CHECKS \ + do { \ + extern int leak_check_enabled; \ + leak_check_enabled = 0; \ + } while (0); + #endif |