tests: Drop the superfluous igt_require_hang_ring()

As the hang injection now itself checks for validity before use, the
tests don't need to do so themselves. Except in certain situations! If
the test forks, it should do requirement checks before the fork (so that
we don't anger the igt gods) and if the test plays around i915.reset
then it needs to do an early igt_require_hang_ring() that is not
affected by the changes to i915.reset.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson
2015-12-16 09:23:56 +00:00
parent a2eb63720b
commit 92caf138f2
4 changed files with 7 additions and 40 deletions
+2 -6
View File
@@ -318,18 +318,14 @@ igt_main
igt_subtest("interruptible")
do_test(fd, false, no_hang);
igt_subtest("interruptible-hang") {
igt_require_hang_ring(fd, I915_EXEC_BLT);
igt_subtest("interruptible-hang")
do_test(fd, false, bcs_hang);
}
igt_subtest("faulting-reloc-interruptible")
do_test(fd, true, no_hang);
igt_subtest("faulting-reloc-interruptible-hang") {
igt_require_hang_ring(fd, I915_EXEC_BLT);
igt_subtest("faulting-reloc-interruptible-hang")
do_test(fd, true, bcs_hang);
}
igt_stop_signal_helper();
for (unsigned flags = 0; flags <= ALL_FLAGS; flags++) {