diff options
| author | Marek Chalupa <mchqwerty@gmail.com> | 2014-11-28 09:41:50 +0100 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2014-11-28 13:27:34 +0200 |
| commit | bef2948348748d1144b2b620fb8fb4bcdd5c0e02 (patch) | |
| tree | 333973834e3a1fe0f2337504151ee31337d10bb9 | |
| parent | 93e352d05808820664f8bcb362785d1861b78ccb (diff) | |
tests: rename env vars for tests
Rename WAYLAND_TESTS_NO_TIMEOUTS to WAYLAND_TEST_NO_TIMEOUTS.
Further rename NO_ASSERT_LEAK_CHECK to WAYLAND_TEST_NO_LEAK_CHECK.
Now the naming is consistent not only here, in Wayland, but even with
naming of weston env varibles related to testing.
This is version 2 of the patch. The first version just renamed
NO_ASSERT_LEAK_CHECK to WAYLAND_TEST_NO_LEAK_CHECK.
Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Acked-by: Bryce Harrington <b.harrington@samsung.com>
| -rw-r--r-- | tests/test-runner.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/test-runner.c b/tests/test-runner.c index d965a43..67763b3 100644 --- a/tests/test-runner.c +++ b/tests/test-runner.c @@ -42,11 +42,14 @@ static void (*sys_free)(void*); static void* (*sys_realloc)(void*, size_t); static void* (*sys_calloc)(size_t, size_t); +/* when set to 1, check if tests are not leaking memory and opened files. + * It is turned on by default. It can be turned off by + * WAYLAND_TEST_NO_LEAK_CHECK environment variable. */ int leak_check_enabled; /* when this var is set to 0, every call to test_set_timeout() is * suppressed - handy when debugging the test. Can be set by - * WAYLAND_TESTS_NO_TIMEOUTS evnironment var */ + * WAYLAND_TEST_NO_TIMEOUTS evnironment var */ static int timeouts_enabled = 1; extern const struct test __start_test_section, __stop_test_section; @@ -234,8 +237,8 @@ int main(int argc, char *argv[]) sys_malloc = dlsym(RTLD_NEXT, "malloc"); sys_free = dlsym(RTLD_NEXT, "free"); - leak_check_enabled = !getenv("NO_ASSERT_LEAK_CHECK"); - timeouts_enabled = !getenv("WAYLAND_TESTS_NO_TIMEOUTS"); + leak_check_enabled = !getenv("WAYLAND_TEST_NO_LEAK_CHECK"); + timeouts_enabled = !getenv("WAYLAND_TEST_NO_TIMEOUTS"); if (argc == 2 && strcmp(argv[1], "--help") == 0) usage(argv[0], EXIT_SUCCESS); |