diff options
| author | Daniel Stone <daniels@collabora.com> | 2023-04-11 17:16:11 +0100 |
|---|---|---|
| committer | Pekka Paalanen <pq@iki.fi> | 2023-04-12 10:52:57 +0000 |
| commit | 3ae62c208c550839a27b0a7a729fc7ccebc43a21 (patch) | |
| tree | ea7063ce06023ca762215ff76c6344ffb54d686c | |
| parent | 03add7dce5859838108c837e43321985b0e49712 (diff) | |
| download | weston-3ae62c208c550839a27b0a7a729fc7ccebc43a21.tar.gz | |
tests: Move prog_args_save() later
This allows us to append to the arguments later on.
Signed-off-by: Daniel Stone <daniels@collabora.com>
| -rw-r--r-- | tests/weston-test-fixture-compositor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/weston-test-fixture-compositor.c b/tests/weston-test-fixture-compositor.c index f5792bda..c537fd69 100644 --- a/tests/weston-test-fixture-compositor.c +++ b/tests/weston-test-fixture-compositor.c @@ -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); |