[igt-dev] [PATCH i-g-t v2 2/2] tests/kms_universal_plane: Convert test to dynamic

[Ananya Sharma]

Modified kms_universal_plane to include dynamic test cases.

Signed-off-by: Ananya Sharma <ananya.sharma at intel.com>
---
 tests/kms_universal_plane.c | 76 ++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 35 deletions(-)

diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
index bd0900a2..9fddc9c5 100644
--- a/tests/kms_universal_plane.c
+++ b/tests/kms_universal_plane.c
@@ -767,35 +767,46 @@ run_tests_for_pipe(data_t *data, enum pipe pipe)
 	}
 
 	igt_describe("Check the switching between different primary plane fbs with CRTC off");
-	igt_subtest_f("universal-plane-pipe-%s-functional",
-		      kmstest_pipe_name(pipe))
-		for_each_valid_output_on_pipe(&data->display, pipe, output)
-			functional_test_pipe(data, pipe, output);
-
-	igt_describe("Test for scale-up or scale-down using universal plane API without covering CRTC");
-	igt_subtest_f("universal-plane-pipe-%s-sanity",
-		      kmstest_pipe_name(pipe))
-		for_each_valid_output_on_pipe(&data->display, pipe, output)
-			sanity_test_pipe(data, pipe, output);
-
-	igt_describe("Check pageflips while primary plane is disabled before IOCTL or between IOCTL"
-			" and pageflip execution");
-	igt_subtest_f("disable-primary-vs-flip-pipe-%s",
-		      kmstest_pipe_name(pipe))
-		for_each_valid_output_on_pipe(&data->display, pipe, output)
-			pageflip_test_pipe(data, pipe, output);
-
-	igt_describe("Check for cursor leaks after performing cursor operations");
-	igt_subtest_f("cursor-fb-leak-pipe-%s",
-		      kmstest_pipe_name(pipe))
-		for_each_valid_output_on_pipe(&data->display, pipe, output)
-			cursor_leak_test_pipe(data, pipe, output);
-
-	igt_describe("Check if pageflip succeeds in windowed setting");
-	igt_subtest_f("universal-plane-gen9-features-pipe-%s",
-		      kmstest_pipe_name(pipe))
-		for_each_valid_output_on_pipe(&data->display, pipe, output)
-			gen9_test_pipe(data, pipe, output);
+        igt_subtest_with_dynamic("universal-plane-pipe-functional"){
+                for_each_pipe_with_valid_output(&data->display, pipe, output){
+                        igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe),igt_output_name(output)){
+                                functional_test_pipe(data, pipe, output);
+                        }
+                }
+        }
+        igt_describe("Test for scale-up or scale-down using universal plane API without covering CRTC");
+        igt_subtest_with_dynamic("universal-plane-pipe-sanity"){
+                for_each_pipe_with_valid_output(&data->display, pipe, output){
+                        igt_dynamic_f("pipe-%s", kmstest_pipe_name(pipe)){
+                                sanity_test_pipe(data, pipe, output);
+                        }
+                }
+        }
+        igt_describe("Check pageflips while primary plane is disabled before IOCTL or between IOCTL"
+                        " and pageflip execution");
+        igt_subtest_with_dynamic("disable-primary-vs-flip"){
+                for_each_pipe_with_valid_output(&data->display, pipe, output){
+                        igt_dynamic_f("pipe-%s", kmstest_pipe_name(pipe)){
+                                pageflip_test_pipe(data, pipe, output);
+                        }
+                }
+        }
+        igt_describe("Check for cursor leaks after performing cursor operations");
+        igt_subtest_with_dynamic("cursor-fb-leak"){
+                for_each_pipe_with_valid_output(&data->display, pipe, output){
+                        igt_dynamic_f("pipe-%s", kmstest_pipe_name(pipe)){
+                                cursor_leak_test_pipe(data, pipe, output);
+                        }
+		}
+        }
+        igt_describe("Check if pageflip succeeds in windowed setting");
+        igt_subtest_with_dynamic("universal-plane-gen9-features"){
+                for_each_pipe_with_valid_output(&data->display, pipe, output){
+                        igt_dynamic_f("pipe-%s", kmstest_pipe_name(pipe)){
+                                gen9_test_pipe(data, pipe, output);
+                        }
+                }
+        }
 }
 
 static data_t data;
@@ -814,12 +825,7 @@ igt_main
 		igt_require_pipe_crc(data.drm_fd);
 		igt_display_require(&data.display, data.drm_fd);
 	}
-
-	for_each_pipe_static(pipe) {
-		igt_subtest_group
-			run_tests_for_pipe(&data, pipe);
-	}
-
+	run_tests_for_pipe(&data, pipe);
 	igt_fixture {
 		igt_display_fini(&data.display);
 	}
-- 
2.25.1