diff options
| author | Petri Latvala <petri.latvala@intel.com> | 2017-02-06 12:11:43 +0200 |
|---|---|---|
| committer | Petri Latvala <petri.latvala@intel.com> | 2017-02-06 13:17:10 +0200 |
| commit | c5854989052af7d2022fb042bd7c69c2e27132ee (patch) | |
| tree | 28042120dfa1ccaed701ffea0e04bd84672f933b /tests | |
| parent | cc8c9608acd5b795c0cc85ca6dec4c7f697d7705 (diff) | |
tests/gem_exec_reloc: Don't call igt_(dis)allow_hang outside fixtures
gem_exec_reloc --list-subtests breaks otherwise.
v2: use igt_subtest_group (Chris)
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gem_exec_reloc.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/tests/gem_exec_reloc.c b/tests/gem_exec_reloc.c index 78bb59cf..8356d852 100644 --- a/tests/gem_exec_reloc.c +++ b/tests/gem_exec_reloc.c @@ -550,19 +550,25 @@ igt_main for (f = flags; f->name; f++) { igt_hang_t hang; - if (f->flags & HANG) - hang = igt_allow_hang(fd, 0, 0); - - for (m = modes; m->name; m++) { - igt_subtest_f("%s%s%s", - f->basic ? "basic-" : "", - m->name, - f->name) - basic_reloc(fd, m->before, m->after, f->flags); + igt_subtest_group { + igt_fixture { + if (f->flags & HANG) + hang = igt_allow_hang(fd, 0, 0); + } + + for (m = modes; m->name; m++) { + igt_subtest_f("%s%s%s", + f->basic ? "basic-" : "", + m->name, + f->name) + basic_reloc(fd, m->before, m->after, f->flags); + } + + igt_fixture { + if (f->flags & HANG) + igt_disallow_hang(fd, hang); + } } - - if (f->flags & HANG) - igt_disallow_hang(fd, hang); } igt_subtest("basic-softpin") |