mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-07-21 10:44:25 +00:00
tests: Move prog_args_save() later
This allows us to append to the arguments later on. Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
parent
03add7dce5
commit
3ae62c208c
|
@ -366,10 +366,6 @@ execute_compositor(const struct compositor_setup *setup,
|
|||
if (setup->xwayland)
|
||||
prog_args_take(&args, strdup("--xwayland"));
|
||||
|
||||
test_data.test_quirks = setup->test_quirks;
|
||||
test_data.test_private_data = data;
|
||||
prog_args_save(&args);
|
||||
|
||||
if (setenv("WESTON_MODULE_MAP", WESTON_MODULE_MAP, 0) < 0 ||
|
||||
setenv("WESTON_DATA_DIR", WESTON_DATA_DIR, 0) < 0) {
|
||||
fprintf(stderr, "Error: environment setup failed.\n");
|
||||
|
@ -411,6 +407,10 @@ execute_compositor(const struct compositor_setup *setup,
|
|||
}
|
||||
#endif
|
||||
|
||||
test_data.test_quirks = setup->test_quirks;
|
||||
test_data.test_private_data = data;
|
||||
prog_args_save(&args);
|
||||
|
||||
if (ret == RESULT_OK)
|
||||
ret = wet_main(args.argc, args.argv, &test_data);
|
||||
|
||||
|
|
Loading…
Reference in a new issue