lib/drmtest: Fix up skip_henceforth checks

We need to first check whether we'll even run the testcase before
deciding to print a premature SKIP/FAIL. Without this and global
skipped resulted in superflous output when running only one testcase.

References: https://bugs.freedesktop.org/show_bug.cgi?id=74100
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-02-11 12:14:09 +01:00
parent a6bc3d91af
commit 333a5c6f07

View File

@ -972,6 +972,10 @@ bool __igt_run_subtest(const char *subtest_name)
return false;
}
if (run_single_subtest &&
strcmp(subtest_name, run_single_subtest) != 0)
return false;
if (skip_subtests_henceforth) {
printf("Subtest %s: %s\n", subtest_name,
skip_subtests_henceforth == SKIP ?
@ -979,14 +983,7 @@ bool __igt_run_subtest(const char *subtest_name)
return false;
}
if (!run_single_subtest) {
return (in_subtest = subtest_name);
} else {
if (strcmp(subtest_name, run_single_subtest) == 0)
return (in_subtest = subtest_name);
return false;
}
return (in_subtest = subtest_name);
}
const char *igt_subtest_name(void)