[igt-dev] [PATCH i-g-t] gem_wait/gem_busy: Make the "all" variant a normal subtest

[Petri Latvala]

While dynamic subtests are kind of testlistable, the support for them
is dark and full of terrors. Cornercases like resuming or
multiple-mode are not quite fully specified and can lead to surprises
later.

The subtests in question don't carry any context so conversion to
normal subtests is straightforward.

Signed-off-by: Petri Latvala <petri.latvala at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
---
 tests/i915/gem_busy.c                 | 10 +++++-----
 tests/i915/gem_wait.c                 | 12 ++++++------
 tests/intel-ci/fast-feedback.testlist |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/i915/gem_busy.c b/tests/i915/gem_busy.c
index 5e4e2d93..4e574434 100644
--- a/tests/i915/gem_busy.c
+++ b/tests/i915/gem_busy.c
@@ -495,12 +495,12 @@ igt_main
 			igt_fork_hang_detector(fd);
 		}
 
-		igt_subtest_with_dynamic("busy") {
-			igt_dynamic("all") {
-				gem_quiescent_gpu(fd);
-				all(fd);
-			}
+		igt_subtest("busy-all") {
+			gem_quiescent_gpu(fd);
+			all(fd);
+		}
 
+		igt_subtest_with_dynamic("busy") {
 			__for_each_physical_engine(fd, e) {
 				igt_dynamic_f("%s", e->name) {
 					gem_quiescent_gpu(fd);
diff --git a/tests/i915/gem_wait.c b/tests/i915/gem_wait.c
index 43b3a658..73337845 100644
--- a/tests/i915/gem_wait.c
+++ b/tests/i915/gem_wait.c
@@ -149,13 +149,13 @@ static void test_all_engines(const char *name, int i915, unsigned int test)
 {
 	const struct intel_execution_engine2 *e;
 
-	igt_subtest_with_dynamic(name) {
-		igt_dynamic("all") {
-			gem_quiescent_gpu(i915);
-			basic(i915, ALL_ENGINES, test);
-			gem_quiescent_gpu(i915);
-		}
+	igt_subtest_f("%s-all", name) {
+		gem_quiescent_gpu(i915);
+		basic(i915, ALL_ENGINES, test);
+		gem_quiescent_gpu(i915);
+	}
 
+	igt_subtest_with_dynamic(name) {
 		__for_each_physical_engine(i915, e) {
 			igt_dynamic_f("%s", e->name) {
 				gem_quiescent_gpu(i915);
diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index 2ccad438..b80ccebb 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -6,7 +6,7 @@ igt at fbdev@mmap
 igt at gem_basic@bad-close
 igt at gem_basic@create-close
 igt at gem_basic@create-fd-close
-igt at gem_busy@busy at all
+igt at gem_busy@busy-all
 igt at gem_close_race@basic-process
 igt at gem_close_race@basic-threads
 igt at gem_ctx_create@basic
@@ -41,8 +41,8 @@ igt at gem_sync@basic-each
 igt at gem_tiled_blits@basic
 igt at gem_tiled_fence_blits@basic
 igt at gem_tiled_pread_basic
-igt at gem_wait@busy at all
-igt at gem_wait@wait at all
+igt at gem_wait@busy-all
+igt at gem_wait@wait-all
 igt at i915_getparams_basic@basic-eu-total
 igt at i915_getparams_basic@basic-subslice-total
 igt at i915_hangman@error-state-basic
-- 
2.20.1