diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-22 15:59:05 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-22 15:59:05 +0100 |
| commit | cb42b0d0789f86a214b821bc171979e082952649 (patch) | |
| tree | e559d2869767e60ba091c28d5ed53ef763fe936f /tests/prime_vgem.c | |
| parent | b5ac73a85c92ac647fce0cbc151a210477e2cd68 (diff) | |
Revert "tests/prime_vgem: Remove BAT sub-tests that cause intermittent fails."
This reverts commit 5188745c4b531d09508cf0897fb90a3634299283.
Diffstat (limited to 'tests/prime_vgem.c')
| -rw-r--r-- | tests/prime_vgem.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c index 888131db..ae69965b 100644 --- a/tests/prime_vgem.c +++ b/tests/prime_vgem.c @@ -26,8 +26,6 @@ #include <sys/poll.h> -#define BASIC 0x10 - IGT_TEST_DESCRIPTION("Basic check of polling for prime/vgem fences."); static void test_read(int vgem, int i915) @@ -671,7 +669,6 @@ igt_main int i915 = -1; int vgem = -1; int gen = 0; - unsigned int flags = 0x0; igt_skip_on_simulation(); @@ -696,7 +693,7 @@ igt_main for (e = intel_execution_engines; e->name; e++) { igt_subtest_f("%ssync-%s", - e->exec_id == 0 && (flags & BASIC) ? "basic-" : "", + e->exec_id == 0 ? "basic-" : "", e->name) { gem_require_ring(i915, e->exec_id | e->flags); igt_skip_on_f(gen == 6 && @@ -709,7 +706,7 @@ igt_main for (e = intel_execution_engines; e->name; e++) { igt_subtest_f("%sbusy-%s", - e->exec_id == 0 && (flags & BASIC) ? "basic-" : "", + e->exec_id == 0 ? "basic-" : "", e->name) { gem_require_ring(i915, e->exec_id | e->flags); igt_skip_on_f(gen == 6 && @@ -722,7 +719,7 @@ igt_main for (e = intel_execution_engines; e->name; e++) { igt_subtest_f("%swait-%s", - e->exec_id == 0 && (flags & BASIC) ? "basic-" : "", + e->exec_id == 0 ? "basic-" : "", e->name) { gem_require_ring(i915, e->exec_id | e->flags); igt_skip_on_f(gen == 6 && @@ -746,7 +743,7 @@ igt_main for (e = intel_execution_engines; e->name; e++) { igt_subtest_f("%sfence-wait-%s", - e->exec_id == 0 && (flags & BASIC) ? "basic-" : "", + e->exec_id == 0 ? "basic-" : "", e->name) { gem_require_ring(i915, e->exec_id | e->flags); igt_skip_on_f(gen == 6 && @@ -757,7 +754,7 @@ igt_main } } - igt_subtest_f("%sfence-flip", flags & BASIC ? "basic-" : "") + igt_subtest("basic-fence-flip") test_flip(i915, vgem, 0); igt_subtest_group { |