[igt-dev] [i-g-t] tests/kms_pipe_crc_basic: Avoid skips in dynamic subtets

[Bhanuprakash Modem]

Instead of Skipping the dynamic subtest, just don't trigger the test.

Cc: Swati Sharma <swati2.sharma at intel.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
---
 tests/kms_pipe_crc_basic.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
index 0f34f807..2ff40f72 100644
--- a/tests/kms_pipe_crc_basic.c
+++ b/tests/kms_pipe_crc_basic.c
@@ -276,6 +276,7 @@ data_t data = {0, };
 igt_main
 {
 	enum pipe pipe;
+	igt_output_t *output;
 	struct {
 		const char *name;
 		unsigned flags;
@@ -317,10 +318,7 @@ igt_main
 	for (i = 0; i < ARRAY_SIZE(tests); i++) {
 		igt_describe(tests[i].desc);
 		igt_subtest_with_dynamic(tests[i].name) {
-			for_each_pipe(&data.display, pipe) {
-				igt_output_t *output = igt_get_single_output_for_pipe(&data.display, pipe);
-
-				igt_require(output);
+			for_each_pipe_with_single_output(&data.display, pipe, output) {
 				igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), output->name) {
 					if (tests[i].flags & TEST_SUSPEND) {
 						test_read_crc(&data, pipe, output, 0);
@@ -348,10 +346,7 @@ igt_main
 	igt_describe("Check that disabling CRCs on a CRTC after having disabled the CRTC "
 		     "does not cause issues.");
 	igt_subtest_with_dynamic("disable-crc-after-crtc") {
-		for_each_pipe(&data.display, pipe) {
-			igt_output_t *output = igt_get_single_output_for_pipe(&data.display, pipe);
-
-			igt_require(output);
+		for_each_pipe_with_single_output(&data.display, pipe, output) {
 			igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), output->name)
 				test_disable_crc_after_crtc(&data, pipe, output);
 		}
@@ -359,10 +354,7 @@ igt_main
 
 	igt_describe("Basic sanity check for CRC mismatches");
 	igt_subtest_with_dynamic("compare-crc-sanitycheck") {
-		for_each_pipe(&data.display, pipe) {
-			igt_output_t *output = igt_get_single_output_for_pipe(&data.display, pipe);
-
-			igt_require(output);
+		for_each_pipe_with_single_output(&data.display, pipe, output) {
 			igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), output->name)
 				test_compare_crc(&data, pipe, output);
 		}
-- 
2.35.1