diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/drmtest.c | 4 | ||||
| -rw-r--r-- | lib/drmtest.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/drmtest.c b/lib/drmtest.c index f6e6ccbe..46227c35 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -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); } diff --git a/lib/drmtest.h b/lib/drmtest.h index 8dd9f790..c0398329 100644 --- a/lib/drmtest.h +++ b/lib/drmtest.h @@ -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 * |