mirror of
https://gitlab.freedesktop.org/wayland/wayland.git
synced 2026-03-19 05:34:02 -04:00
Add simple memory leak check to all tests.
Wrap all tests with a memory balance check to detect potential memory leaks. Fixed a few tests that had memory leaks contained in the tests themselves. Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
This commit is contained in:
parent
9086b60d81
commit
a0e590a0f3
5 changed files with 37 additions and 1 deletions
|
|
@ -12,5 +12,5 @@ event_loop_test_SOURCES = event-loop-test.c test-runner.c
|
||||||
AM_CFLAGS = $(GCC_CFLAGS)
|
AM_CFLAGS = $(GCC_CFLAGS)
|
||||||
LDADD = $(top_builddir)/src/libwayland-util.la \
|
LDADD = $(top_builddir)/src/libwayland-util.la \
|
||||||
$(top_builddir)/src/libwayland-server.la \
|
$(top_builddir)/src/libwayland-server.la \
|
||||||
-lrt $(FFI_LIBS)
|
-lrt -ldl $(FFI_LIBS)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -133,4 +133,6 @@ TEST(array_for_each)
|
||||||
wl_array_for_each(p, &array)
|
wl_array_for_each(p, &array)
|
||||||
assert(*p == elements[i++]);
|
assert(*p == elements[i++]);
|
||||||
assert(i == 5);
|
assert(i == 5);
|
||||||
|
|
||||||
|
wl_array_release(&array);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -90,4 +90,6 @@ TEST(map_remove)
|
||||||
l = wl_map_insert_new(&map, WL_MAP_SERVER_SIDE, &d);
|
l = wl_map_insert_new(&map, WL_MAP_SERVER_SIDE, &d);
|
||||||
assert(l == WL_SERVER_ID_START + 1);
|
assert(l == WL_SERVER_ID_START + 1);
|
||||||
assert(wl_map_lookup(&map, l) == &d);
|
assert(wl_map_lookup(&map, l) == &d);
|
||||||
|
|
||||||
|
wl_map_release(&map);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,8 @@
|
||||||
* OF THIS SOFTWARE.
|
* OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define _GNU_SOURCE
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
@ -27,10 +29,28 @@
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <dlfcn.h>
|
||||||
#include "test-runner.h"
|
#include "test-runner.h"
|
||||||
|
|
||||||
|
static int num_alloc;
|
||||||
|
static void* (*sys_malloc)(size_t);
|
||||||
|
static void (*sys_free)(void*);
|
||||||
|
|
||||||
extern const struct test __start_test_section, __stop_test_section;
|
extern const struct test __start_test_section, __stop_test_section;
|
||||||
|
|
||||||
|
void* malloc(size_t size)
|
||||||
|
{
|
||||||
|
num_alloc++;
|
||||||
|
return sys_malloc(size);
|
||||||
|
}
|
||||||
|
|
||||||
|
void free(void* mem)
|
||||||
|
{
|
||||||
|
if (mem != NULL)
|
||||||
|
num_alloc--;
|
||||||
|
sys_free(mem);
|
||||||
|
}
|
||||||
|
|
||||||
static const struct test *
|
static const struct test *
|
||||||
find_test(const char *name)
|
find_test(const char *name)
|
||||||
{
|
{
|
||||||
|
|
@ -46,7 +66,10 @@ find_test(const char *name)
|
||||||
static void
|
static void
|
||||||
run_test(const struct test *t)
|
run_test(const struct test *t)
|
||||||
{
|
{
|
||||||
|
int cur_alloc = num_alloc;
|
||||||
|
|
||||||
t->run();
|
t->run();
|
||||||
|
assert(("memory leak detected in test.", cur_alloc == num_alloc));
|
||||||
exit(EXIT_SUCCESS);
|
exit(EXIT_SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -57,6 +80,10 @@ int main(int argc, char *argv[])
|
||||||
int total, pass;
|
int total, pass;
|
||||||
siginfo_t info;
|
siginfo_t info;
|
||||||
|
|
||||||
|
/* Load system malloc and free */
|
||||||
|
sys_malloc = dlsym(RTLD_NEXT, "malloc");
|
||||||
|
sys_free = dlsym(RTLD_NEXT, "free");
|
||||||
|
|
||||||
if (argc == 2) {
|
if (argc == 2) {
|
||||||
t = find_test(argv[1]);
|
t = find_test(argv[1]);
|
||||||
if (t == NULL) {
|
if (t == NULL) {
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,6 @@
|
||||||
|
#ifndef _TEST_RUNNER_H_
|
||||||
|
#define _TEST_RUNNER_H_
|
||||||
|
|
||||||
struct test {
|
struct test {
|
||||||
const char *name;
|
const char *name;
|
||||||
void (*run)(void);
|
void (*run)(void);
|
||||||
|
|
@ -12,3 +15,5 @@ struct test {
|
||||||
}; \
|
}; \
|
||||||
\
|
\
|
||||||
static void name(void)
|
static void name(void)
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue