flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-07-23 09:56:02 +00:00
Code Issues Releases Wiki Activity

lib/drmtest: make igt_fail work outside of subtests

Browse Source 
With the abortable fixtures we can now correctly fail all subsequent
sutbests if we hit upon an igt_assert outside of a subtest.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2013-08-19 07:28:42 +02:00
parent 78865847f9
commit 47a32a3aec
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/drmtest.c
View File

@ -691,7 +691,9 @@ static char *run_single_subtest = NULL;
static const char *in_subtest = NULL; static const char *in_subtest = NULL;
static bool in_fixture = false; static bool in_fixture = false;
static bool test_with_subtests = false; static bool test_with_subtests = false;
static bool skip_subtests_henceforth = false; static enum {
CONT = 0, SKIP, FAIL
} skip_subtests_henceforth = CONT;
bool __igt_fixture(void) bool __igt_fixture(void)
{ {
@ -759,7 +761,9 @@ bool __igt_run_subtest(const char *subtest_name)
} }
if (skip_subtests_henceforth) { if (skip_subtests_henceforth) {
printf("Subtest %s: SKIP\n", subtest_name); printf("Subtest %s: %s\n", subtest_name,
skip_subtests_henceforth == SKIP ?
"SKIP" : "FAIL");
return false; return false;
} }
@ -803,7 +807,7 @@ void igt_skip(void)
if (in_subtest) { if (in_subtest) {
exit_subtest("SKIP"); exit_subtest("SKIP");
} else if (test_with_subtests) { } else if (test_with_subtests) {
skip_subtests_henceforth = true; skip_subtests_henceforth = SKIP;
if (in_fixture) if (in_fixture)
__igt_fixture_end(); __igt_fixture_end();
} else { } else {
@ -841,7 +845,13 @@ void igt_fail(int exitcode)
if (in_subtest) if (in_subtest)
exit_subtest("FAIL"); exit_subtest("FAIL");
else { else {
assert(!test_with_subtests); assert(!test_with_subtests || in_fixture);
if (in_fixture) {
skip_subtests_henceforth = FAIL;
__igt_fixture_end();
}
exit(exitcode); exit(exitcode);
} }
} }