diff options
| author | Thomas Wood <thomas.wood@intel.com> | 2015-02-18 16:19:59 +0000 |
|---|---|---|
| committer | Thomas Wood <thomas.wood@intel.com> | 2015-02-25 16:48:25 +0000 |
| commit | 8fb19782f82f25249aaed0ff0e5fa6601dbb0e9d (patch) | |
| tree | 803568509acd7bfc35f9596cf3db1a59937c2ed4 /lib/tests | |
| parent | 55cc132b3219fbbf8c5705c674ef0f9a9b53d593 (diff) | |
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>
Diffstat (limited to 'lib/tests')
| -rw-r--r-- | lib/tests/igt_list_only.c | 3 | ||||
| -rw-r--r-- | lib/tests/igt_no_exit.c | 3 | ||||
| -rw-r--r-- | lib/tests/igt_no_exit_list_only.c | 3 | ||||
| -rw-r--r-- | lib/tests/igt_no_subtest.c | 3 | ||||
| -rw-r--r-- | lib/tests/igt_simulation.c | 15 |
5 files changed, 18 insertions, 9 deletions
diff --git a/lib/tests/igt_list_only.c b/lib/tests/igt_list_only.c index d3ea8c27..65fa9da6 100644 --- a/lib/tests/igt_list_only.c +++ b/lib/tests/igt_list_only.c @@ -32,8 +32,9 @@ int main(int argc, char **argv) char prog[] = "igt_list_only"; char arg[] = "--list-subtests"; char *fake_argv[] = {prog, arg}; + int fake_argc = 2; - igt_subtest_init(2, fake_argv); + igt_subtest_init(fake_argc, fake_argv); igt_subtest("A") ; diff --git a/lib/tests/igt_no_exit.c b/lib/tests/igt_no_exit.c index ba3fae0a..dc89b830 100644 --- a/lib/tests/igt_no_exit.c +++ b/lib/tests/igt_no_exit.c @@ -31,8 +31,9 @@ int main(int argc, char **argv) { char prog[] = "igt_no_exit"; char *fake_argv[] = {prog}; + int fake_argc = 1; - igt_subtest_init(1, fake_argv); + igt_subtest_init(fake_argc, fake_argv); igt_subtest("A") ; diff --git a/lib/tests/igt_no_exit_list_only.c b/lib/tests/igt_no_exit_list_only.c index 3b232be7..add3fc25 100644 --- a/lib/tests/igt_no_exit_list_only.c +++ b/lib/tests/igt_no_exit_list_only.c @@ -32,8 +32,9 @@ int main(int argc, char **argv) char prog[] = "igt_list_only"; char arg[] = "--list-subtests"; char *fake_argv[] = {prog, arg}; + int fake_argc = 2; - igt_subtest_init(2, fake_argv); + igt_subtest_init(fake_argc, fake_argv); igt_subtest("A") ; diff --git a/lib/tests/igt_no_subtest.c b/lib/tests/igt_no_subtest.c index 47f15fce..1ae62cfd 100644 --- a/lib/tests/igt_no_subtest.c +++ b/lib/tests/igt_no_subtest.c @@ -31,8 +31,9 @@ int main(int argc, char **argv) { char prog[] = "igt_no_exit"; char *fake_argv[] = {prog}; + int fake_argc = 1; - igt_subtest_init(1, fake_argv); + igt_subtest_init(fake_argc, fake_argv); igt_exit(); } diff --git a/lib/tests/igt_simulation.c b/lib/tests/igt_simulation.c index e5889590..32830ba7 100644 --- a/lib/tests/igt_simulation.c +++ b/lib/tests/igt_simulation.c @@ -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 |