[igt-dev] [i-g-t 1/2] tests/kms_cursor_edge_walk: Re-org dynamic subtests

Bhanuprakash Modem bhanuprakash.modem at intel.com
Fri Feb 10 04:24:18 UTC 2023


Instead of clubbing all dynamic subtests, let's have an individual
subtest for each size & type.

Fixes: 54ff3199b (tests/kms_cursor_edge_walk: Convert tests to dynamic)
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
---
 tests/kms_cursor_edge_walk.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/kms_cursor_edge_walk.c b/tests/kms_cursor_edge_walk.c
index e653b9ab9..96812776c 100644
--- a/tests/kms_cursor_edge_walk.c
+++ b/tests/kms_cursor_edge_walk.c
@@ -342,21 +342,21 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
 		igt_display_require_output(&data.display);
 	}
 
-	igt_describe("Checking cursor by walking left/right/top/bottom edge of screen");
-	igt_subtest_group {
-		for (i = 0; i < ARRAY_SIZE(tests); i++) {
-			igt_subtest_with_dynamic(tests[i].name) {
+	for (i = 0; i < ARRAY_SIZE(tests); i++) {
+		for (data.curw = 64; data.curw <= 256; data.curw *= 2) {
+			data.curh = data.curw;
+			igt_fixture
+				igt_require(data.curw <= max_curw && data.curh <= max_curh);
+
+			igt_describe_f("Checking cursor size %dx%d by walking %s of screen",
+					data.curw, data.curh, tests[i].name);
+			igt_subtest_with_dynamic_f("%dx%d-%s", data.curw,
+						   data.curh, tests[i].name) {
 				for_each_pipe_with_single_output(&data.display, data.pipe, data.output) {
-					for (data.curw = 64; data.curw <= 256; data.curw *= 2) {
-						data.curh = data.curw;
-						igt_require(data.curw <= max_curw && data.curh <= max_curh);
-
-						igt_dynamic_f("pipe-%s-%s-%dx%d",
-							      kmstest_pipe_name(data.pipe),
-							      data.output->name,
-							      data.curw, data.curh)
-							test_crtc(&data, tests[i].flags);
-					}
+					igt_dynamic_f("pipe-%s-%s",
+						      kmstest_pipe_name(data.pipe),
+						      data.output->name)
+						test_crtc(&data, tests[i].flags);
 				}
 			}
 		}
-- 
2.39.0



More information about the igt-dev mailing list