[igt-dev] [PATCH i-g-t 1/7] tests/gem_exec_reloc: Remove banned tests
From: Daniel Vetter <hidden>
Date: 2021-06-08 09:38:43
Subsystem:
the rest · Maintainer:
Linus Torvalds
These have been banned across all CI for over 2 years, realistically that's not going to change and they're just in the way. Cc: Jason Ekstrand <redacted> Cc: Petri Latvala <redacted> Signed-off-by: Daniel Vetter <redacted> --- tests/i915/gem_exec_reloc.c | 31 +++++-------------------------- tests/intel-ci/blacklist.txt | 1 - 2 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/tests/i915/gem_exec_reloc.c b/tests/i915/gem_exec_reloc.c
index 397c335e4d3c..cb4899fe6e1e 100644
--- a/tests/i915/gem_exec_reloc.c
+++ b/tests/i915/gem_exec_reloc.c@@ -614,8 +614,6 @@ static bool has_64b_reloc(int fd) #define NORELOC 1 #define ACTIVE 2 -#define INTERRUPTIBLE 4 -#define HANG 8 static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags) { #define OBJSZ 8192
@@ -678,8 +676,7 @@ static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags) spin = igt_spin_new(fd, .engine = I915_EXEC_DEFAULT, .dependency = obj.handle); - if (!(flags & HANG)) - igt_spin_set_timeout(spin, NSEC_PER_SEC/100); + igt_assert(gem_bo_busy(fd, obj.handle)); }
@@ -746,8 +743,6 @@ static void basic_reloc(int fd, unsigned before, unsigned after, unsigned flags) spin = igt_spin_new(fd, .engine = I915_EXEC_DEFAULT, .dependency = obj.handle); - if (!(flags & HANG)) - igt_spin_set_timeout(spin, NSEC_PER_SEC/100); igt_assert(gem_bo_busy(fd, obj.handle)); }
@@ -873,8 +868,6 @@ static void basic_range(int fd, unsigned flags) if (flags & ACTIVE) { spin = igt_spin_new(fd, .dependency = obj[n].handle); - if (!(flags & HANG)) - igt_spin_set_timeout(spin, NSEC_PER_SEC/100); igt_assert(gem_bo_busy(fd, obj[n].handle)); }
@@ -1468,8 +1461,6 @@ igt_main { "", 0 , true}, { "-noreloc", NORELOC, true }, { "-active", ACTIVE, true }, - { "-interruptible", ACTIVE | INTERRUPTIBLE }, - { "-hang", ACTIVE | HANG }, { }, }, *f; uint64_t size;
@@ -1483,14 +1474,7 @@ igt_main } for (f = flags; f->name; f++) { - igt_hang_t hang; - 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-" : "",
@@ -1498,22 +1482,17 @@ igt_main f->name) { if ((m->before | m->after) & I915_GEM_DOMAIN_WC) igt_require(gem_mmap__has_wc(fd)); - igt_while_interruptible(f->flags & INTERRUPTIBLE) - basic_reloc(fd, m->before, m->after, f->flags); + + basic_reloc(fd, m->before, m->after, f->flags); } } if (!(f->flags & NORELOC)) { igt_subtest_f("%srange%s", f->basic ? "basic-" : "", f->name) { - igt_while_interruptible(f->flags & INTERRUPTIBLE) - basic_range(fd, f->flags); - } - } - igt_fixture { - if (f->flags & HANG) - igt_disallow_hang(fd, hang); + basic_range(fd, f->flags); + } } } }
diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/blacklist.txt
index 33f92e37f602..4d2555f8adb3 100644
--- a/tests/intel-ci/blacklist.txt
+++ b/tests/intel-ci/blacklist.txt@@ -30,7 +30,6 @@ igt@gem_exec_flush@(?!.*basic).* igt@gem_exec_latency(@.*)? igt@gem_exec_lut_handle(@.*)? igt@gem_exec_nop@(?!.*basic).* -igt@gem_exec_reloc@(?!.*basic).* igt@gem_exec_suspend@(?!.*basic).* igt@gem_exec_whisper@(?!basic).* igt@gem_fd_exhaustion(@.*)?
--
2.24.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev