| Message ID | 1406113075-30860-2-git-send-email-thomas.wood@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Looks fine to me > -----Original Message----- > From: Thomas Wood [mailto:thomas.wood@intel.com] > Sent: Wednesday, July 23, 2014 11:58 AM > To: intel-gfx@lists.freedesktop.org > Cc: Gore, Tim; daniel.vetter@ffwll.ch > Subject: [PATCH i-g-t 1/8] lib: warn when attempting to run an unknown > subtest > > Signed-off-by: Thomas Wood <thomas.wood@intel.com> Reviewed-by: Tim Gore <tim.gore@intel.com> > --- > lib/igt_core.c | 18 +++++++++++++++--- > 1 file changed, 15 insertions(+), 3 deletions(-) > > diff --git a/lib/igt_core.c b/lib/igt_core.c index b197932..5c20581 100644 > --- a/lib/igt_core.c > +++ b/lib/igt_core.c > @@ -204,6 +204,7 @@ static unsigned int exit_handler_count; > /* subtests helpers */ > static bool list_subtests = false; > static char *run_single_subtest = NULL; > +static bool run_single_subtest_found = false; > static const char *in_subtest = NULL; > static bool in_fixture = false; > static bool test_with_subtests = false; @@ -484,9 +485,14 @@ bool > __igt_run_subtest(const char *subtest_name) > return false; > } > > - if (run_single_subtest && > - strcmp(subtest_name, run_single_subtest) != 0) > - return false; > + if (run_single_subtest) { > + if (strcmp(subtest_name, run_single_subtest) != 0) > + return false; > + else > + run_single_subtest_found = true; > + } > + > + > > if (skip_subtests_henceforth) { > printf("Subtest %s: %s\n", subtest_name, @@ -722,6 > +728,12 @@ void igt_exit(void) { > igt_exit_called = true; > > + if (run_single_subtest && !run_single_subtest_found) { > + igt_warn("Unknown subtest: %s\n", run_single_subtest); > + exit(-1); > + } > + > + > if (igt_only_list_subtests()) > exit(IGT_EXIT_SUCCESS); > > -- > 1.9.3
diff --git a/lib/igt_core.c b/lib/igt_core.c index b197932..5c20581 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -204,6 +204,7 @@ static unsigned int exit_handler_count; /* subtests helpers */ static bool list_subtests = false; static char *run_single_subtest = NULL; +static bool run_single_subtest_found = false; static const char *in_subtest = NULL; static bool in_fixture = false; static bool test_with_subtests = false; @@ -484,9 +485,14 @@ bool __igt_run_subtest(const char *subtest_name) return false; } - if (run_single_subtest && - strcmp(subtest_name, run_single_subtest) != 0) - return false; + if (run_single_subtest) { + if (strcmp(subtest_name, run_single_subtest) != 0) + return false; + else + run_single_subtest_found = true; + } + + if (skip_subtests_henceforth) { printf("Subtest %s: %s\n", subtest_name, @@ -722,6 +728,12 @@ void igt_exit(void) { igt_exit_called = true; + if (run_single_subtest && !run_single_subtest_found) { + igt_warn("Unknown subtest: %s\n", run_single_subtest); + exit(-1); + } + + if (igt_only_list_subtests()) exit(IGT_EXIT_SUCCESS);
Signed-off-by: Thomas Wood <thomas.wood@intel.com> --- lib/igt_core.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)