lib/igt_core: fix igt_skip_on_simulation regression

I've forgotten that we might want to call this from within specific
subtests (or special helpers like the autoresume one).

Also props for being competent enough to write a testcase, but
incompetent enough to botch the job up.

Fix both things and remove a leftover debug printf while at it.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter
2014-03-26 15:09:23 +01:00
parent c819014752
commit 71c6f87eb3
2 changed files with 23 additions and 8 deletions
+1 -1
View File
@@ -1132,7 +1132,7 @@ void igt_skip_on_simulation(void)
if (igt_only_list_subtests())
return;
if (!in_fixture) {
if (!in_fixture && !in_subtest) {
igt_fixture
igt_require(!igt_run_in_simulation());
} else