mirror of
https://github.com/tiagovignatti/intel-gpu-tools.git
synced 2025-06-21 23:06:29 +00:00
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:
parent
a6bc3d91af
commit
333a5c6f07
@ -972,6 +972,10 @@ bool __igt_run_subtest(const char *subtest_name)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (run_single_subtest &&
|
||||||
|
strcmp(subtest_name, run_single_subtest) != 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
if (skip_subtests_henceforth) {
|
if (skip_subtests_henceforth) {
|
||||||
printf("Subtest %s: %s\n", subtest_name,
|
printf("Subtest %s: %s\n", subtest_name,
|
||||||
skip_subtests_henceforth == SKIP ?
|
skip_subtests_henceforth == SKIP ?
|
||||||
@ -979,14 +983,7 @@ bool __igt_run_subtest(const char *subtest_name)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!run_single_subtest) {
|
return (in_subtest = subtest_name);
|
||||||
return (in_subtest = subtest_name);
|
|
||||||
} else {
|
|
||||||
if (strcmp(subtest_name, run_single_subtest) == 0)
|
|
||||||
return (in_subtest = subtest_name);
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *igt_subtest_name(void)
|
const char *igt_subtest_name(void)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user