lib: remove handled option arguments from argv

Remove options from argv that have been handled by getopt to allow
additional non-option parameters to be processed in the test application.

This fixes issues when using options such as --debug with tests that accept
additional non-option parameters.

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Thomas Wood
2015-02-18 16:19:59 +00:00
parent 55cc132b32
commit 8fb19782f8
14 changed files with 40 additions and 26 deletions
+10 -5
View File
@@ -55,22 +55,27 @@ char *argv_run[] = { test };
static int do_fork(void)
{
int pid, status;
int argc;
switch (pid = fork()) {
case -1:
internal_assert(0);
case 0:
if (simple) {
igt_simple_init(1, argv_run);
argc = 1;
igt_simple_init(argc, argv_run);
igt_skip_on_simulation();
igt_exit();
} else {
if (list_subtests)
igt_subtest_init(2, argv_list);
else
igt_subtest_init(1, argv_run);
if (list_subtests) {
argc = 2;
igt_subtest_init(argc, argv_list);
} else {
argc = 1;
igt_subtest_init(argc, argv_run);
}
if (in_fixture) {
igt_fixture