mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: fix leak when we won't run DRM-backend tests

Browse Source 
This fixes a leak found running drm-smoke-test with ASan. Do not forget
to call prog_args_fini() when:

- skipping DRM-backend tests because we don't have
  WESTON_TEST_SUITE_DRM_DEVICE set.

- we fail to acquire the lock needed to run DRM-backend tests.

Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com>
This commit is contained in:
Leandro Ribeiro
2021-10-21 10:44:55 -03:00
committed by Daniel Stone
parent d42fa30d14
commit 5911d2a762
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/weston-test-fixture-compositor.c
+12 -7
View File
@@ -92,11 +92,12 @@ prog_args_fini(struct prog_args *p)
{ {
int i; int i;
assert(p->saved); if (p->saved) {
for (i = 0; i < p->argc; i++)
free(p->saved[i]);
free(p->saved);
}
for (i = 0; i < p->argc; i++)
free(p->saved[i]);
free(p->saved);
free(p->argv); free(p->argv);
prog_args_init(p); prog_args_init(p);
} }
@@ -358,7 +359,8 @@ execute_compositor(const struct compositor_setup *setup,
"WESTON_TEST_SUITE_DRM_DEVICE is not set. " \ "WESTON_TEST_SUITE_DRM_DEVICE is not set. " \
"See test suite documentation to learn how " \ "See test suite documentation to learn how " \
"to run them.\n"); "to run them.\n");
return RESULT_SKIP; ret = RESULT_SKIP;
goto out;
} }
asprintf(&tmp, "--drm-device=%s", drm_device); asprintf(&tmp, "--drm-device=%s", drm_device);
prog_args_take(&args, tmp); prog_args_take(&args, tmp);
@@ -368,8 +370,10 @@ execute_compositor(const struct compositor_setup *setup,
prog_args_take(&args, strdup("--continue-without-input")); prog_args_take(&args, strdup("--continue-without-input"));
lock_fd = wait_for_lock(); lock_fd = wait_for_lock();
if (lock_fd == -1) if (lock_fd == -1) {
return RESULT_FAIL; ret = RESULT_FAIL;
goto out;
}
} }
/* Test suite needs the debug protocol to be able to take screenshots */ /* Test suite needs the debug protocol to be able to take screenshots */
@@ -431,6 +435,7 @@ execute_compositor(const struct compositor_setup *setup,
prog_args_save(&args); prog_args_save(&args);
ret = wet_main(args.argc, args.argv, &test_data); ret = wet_main(args.argc, args.argv, &test_data);
out:
prog_args_fini(&args); prog_args_fini(&args);
/* We acquired a lock (if this is a DRM-backend test) and now we can /* We acquired a lock (if this is a DRM-backend test) and now we can