flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-10 17:36:11 +00:00
Code Issues Releases Wiki Activity

lib: Make igt_skip noreturn

Browse Source 
This is a remnant from the subtest code before we had proper
fixture blocks. With those there's no no reason to have igt_skip
calls outside of fixtures or subtests, so we can assert this and
hence always jump out.

Suggested by Thomas Wood since static analyzers got confused about
this.

To check for fallout I've run all tests as non-root so that they'll
all skip. Only very little fallout resulted.

Cc: Thomas Wood <thomas.wood@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-02-11 23:54:19 +01:00
parent 0d1084fe3f
commit a036959f3e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/drmtest.c
View File

@ -1027,8 +1027,8 @@ void igt_skip(const char *f, ...)
exit_subtest("SKIP");
} else if (test_with_subtests) {
skip_subtests_henceforth = SKIP;
if (in_fixture)
__igt_fixture_end();
assert(in_fixture);
__igt_fixture_end();
} else {
exit(77);
}

4
lib/drmtest.h
View File

@ -172,11 +172,11 @@ const char *igt_subtest_name(void);
*
* For normal tests without subtest it will directly exit.
*/
__attribute__((format(printf, 1, 2))) void igt_skip(const char *f, ...);
__attribute__((format(printf, 1, 2))) void igt_skip(const char *f, ...) __attribute__((noreturn));
__attribute__((format(printf, 5, 6)))
void __igt_skip_check(const char *file, const int line,
const char *func, const char *check,
const char *format, ...);
const char *format, ...) __attribute__((noreturn));
/**
* igt_success - complete a (subtest) as successfull
*