From 5188745c4b531d09508cf0897fb90a3634299283 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Mon, 25 Jul 2016 10:57:25 +0300 Subject: tests/prime_vgem: Remove BAT sub-tests that cause intermittent fails. The following tests are causing problems in CI: prime_vgem@basic-fence-flip, fails intermittently on a HSW and SKL prime_vgem@basic-fence-wait-default, fails on all platforms since it was added prime_vgem@basic-sync-default, fails on all platforms since it was added, and it sometimes hangs BYT machine prime_vgem@basic-busy-default, fails on all platforms since it was added prime_vgem@basic-wait-default, fails on all platforms since it was added, and it sometimes hangs BYT machine Add a flag to enable them when they get stable enough. Signed-off-by: Marius Vlad --- tests/prime_vgem.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'tests/prime_vgem.c') diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c index ae69965b..888131db 100644 --- a/tests/prime_vgem.c +++ b/tests/prime_vgem.c @@ -26,6 +26,8 @@ #include +#define BASIC 0x10 + IGT_TEST_DESCRIPTION("Basic check of polling for prime/vgem fences."); static void test_read(int vgem, int i915) @@ -669,6 +671,7 @@ igt_main int i915 = -1; int vgem = -1; int gen = 0; + unsigned int flags = 0x0; igt_skip_on_simulation(); @@ -693,7 +696,7 @@ igt_main for (e = intel_execution_engines; e->name; e++) { igt_subtest_f("%ssync-%s", - e->exec_id == 0 ? "basic-" : "", + e->exec_id == 0 && (flags & BASIC) ? "basic-" : "", e->name) { gem_require_ring(i915, e->exec_id | e->flags); igt_skip_on_f(gen == 6 && @@ -706,7 +709,7 @@ igt_main for (e = intel_execution_engines; e->name; e++) { igt_subtest_f("%sbusy-%s", - e->exec_id == 0 ? "basic-" : "", + e->exec_id == 0 && (flags & BASIC) ? "basic-" : "", e->name) { gem_require_ring(i915, e->exec_id | e->flags); igt_skip_on_f(gen == 6 && @@ -719,7 +722,7 @@ igt_main for (e = intel_execution_engines; e->name; e++) { igt_subtest_f("%swait-%s", - e->exec_id == 0 ? "basic-" : "", + e->exec_id == 0 && (flags & BASIC) ? "basic-" : "", e->name) { gem_require_ring(i915, e->exec_id | e->flags); igt_skip_on_f(gen == 6 && @@ -743,7 +746,7 @@ igt_main for (e = intel_execution_engines; e->name; e++) { igt_subtest_f("%sfence-wait-%s", - e->exec_id == 0 ? "basic-" : "", + e->exec_id == 0 && (flags & BASIC) ? "basic-" : "", e->name) { gem_require_ring(i915, e->exec_id | e->flags); igt_skip_on_f(gen == 6 && @@ -754,7 +757,7 @@ igt_main } } - igt_subtest("basic-fence-flip") + igt_subtest_f("%sfence-flip", flags & BASIC ? "basic-" : "") test_flip(i915, vgem, 0); igt_subtest_group { -- cgit v1.2.3