[igt-dev] [PATCH i-g-t] Revert "tests/kms_plane_scaling: Add plane scaling test descriptions for subtests"

[Ashutosh Dixit]

This reverts commit b0c056b3513e58332887dc50847f359da3e74e53.

Tests are failing with the following signature due to this commit:

Starting subtest: plane-scaling
documenting dynamic subsubtests is impossible, document the subtest instead.please refer to lib/igt_core documentation
kms_plane_scaling: ../lib/igt_core.c:359: internal_assert: Assertion `0' failed.
Received signal SIGABRT.
Stack trace:
 #0 [fatal_sig_handler+0xd6]
 #1 [killpg+0x40]
 #2 [gsignal+0xc7]
 #3 [abort+0x141]
 #4 [uselocale+0x33a]
 #5 [__assert_fail+0x42]
 #6 [internal_assert+0x101]
 #7 [igt_describe_f+0x95]
 #8 [__real_main704+0xa45]
 #9 [main+0x3f]
 #10 [__libc_start_main+0xe7]
 #11 [_start+0x2a]

Cc: Petri Latvala <petri.latvala at intel.com>
Reported-by: Jani Saarinen <jani.saarinen at intel.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit at intel.com>
---
 tests/kms_plane_scaling.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index e8bf78e776..c63eb428f2 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -695,38 +695,32 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
 		igt_output_t *output;
 
 		igt_subtest_with_dynamic("plane-scaling") {
-			igt_describe("Test plane scaling with overlay planes");
 			for_each_pipe_with_single_output(&data.display, pipe, output)
 				igt_dynamic_f("pipe-%s-plane-scaling", kmstest_pipe_name(pipe))
 					test_plane_scaling_on_pipe(&data, pipe, output);
 		}
 
 		igt_subtest_with_dynamic("scaler-with-pixel-format") {
-			igt_describe("Test plane scaling with pixel formats");
 			for_each_pipe_with_single_output(&data.display, pipe, output)
 				igt_dynamic_f("pipe-%s-scaler-with-pixel-format", kmstest_pipe_name(pipe))
 					test_scaler_with_pixel_format_pipe(&data, pipe, output);
 		}
 
 		igt_subtest_with_dynamic("scaler-with-rotation") {
-			igt_describe("Test plane scaling with rotation");
 			for_each_pipe_with_single_output(&data.display, pipe, output)
 				igt_dynamic_f("pipe-%s-scaler-with-rotation", kmstest_pipe_name(pipe))
 					test_scaler_with_rotation_pipe(&data, pipe, output);
 		}
 
 		igt_subtest_with_dynamic("scaler-with-clipping-clamping") {
-			igt_describe("Test plane scaling with clipping-clamping");
 			for_each_pipe_with_single_output(&data.display, pipe, output)
 				igt_dynamic_f("pipe-%s-scaler-with-clipping-clamping", kmstest_pipe_name(pipe))
 					test_scaler_with_clipping_clamping_scenario(&data, pipe, output);
 		}
 	}
 
-	igt_subtest_f("2x-scaler-multi-pipe") {
-		igt_describe("Test multi plane scaling with connected outputs for pipes");
+	igt_subtest_f("2x-scaler-multi-pipe")
 		test_scaler_with_multi_pipe_plane(&data);
-	}
 
 	igt_fixture
 		igt_display_fini(&data.display);
-- 
2.29.2