diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-26 15:09:23 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-26 15:09:23 +0100 |
| commit | 71c6f87eb3dacffbd489c83acfe95baf613d20cb (patch) | |
| tree | 978542ed9351ee77f754cd0cec8de24750c225cd /lib | |
| parent | c8190147526000bc002c611bd3612caf2de22bf8 (diff) | |
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>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/igt_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/igt_core.c b/lib/igt_core.c index cf445efa..6f137ab9 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -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 |