[igt-dev] [PATCH i-g-t] kms_flip_event_leak: Create dynamic subtests

[igt-dev] [PATCH i-g-t] kms_flip_event_leak: Create dynamic subtests

[Nidhi Gupta]

From: Jeevan B <jeevan.b@intel.com>

Converting the existing subtests to dynamic subtests.

Signed-off-by: Jeevan B <jeevan.b@intel.com>
---
 tests/kms_flip_event_leak.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
index ac201293..0acf93c3 100644
--- a/tests/kms_flip_event_leak.c
+++ b/tests/kms_flip_event_leak.c
@@ -89,21 +89,28 @@ static void test(data_t *data, enum pipe pipe, igt_output_t *output)
 	igt_remove_fb(data->drm_fd, &fb[0]);
 }
 
-igt_simple_main
+igt_main
 {
 	data_t data = {};
 	igt_output_t *output;
 	int valid_tests = 0;
 	enum pipe pipe;
 
-	data.drm_fd = drm_open_driver_master(DRIVER_ANY);
-	kmstest_set_vt_graphics_mode();
+	igt_fixture {
+		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
+		kmstest_set_vt_graphics_mode();
+
+		igt_display_require(&data.display, data.drm_fd);
+	}
 
-	igt_display_require(&data.display, data.drm_fd);
 
-	for_each_pipe_with_valid_output(&data.display, pipe, output) {
-		test(&data, pipe, output);
-		valid_tests++;
+	igt_subtest_with_dynamic("kms_flip_event_leak") {
+		for_each_pipe_with_valid_output(&data.display, pipe, output) {
+			igt_dynamic_f("pipe-%s", kmstest_pipe_name(pipe)) {
+				test(&data, pipe, output);
+				valid_tests++;
+			}
+		}
 	}
 
 	igt_require_f(valid_tests, "no valid crtc/connector combinations found\n");
-- 
2.36.0

[igt-dev] ✗ Fi.CI.BUILD: failure for kms_flip_event_leak: Create dynamic subtests

[Patchwork]

== Series Details ==

Series: kms_flip_event_leak: Create dynamic subtests
URL   : https://patchwork.freedesktop.org/series/107012/
State : failure

== Summary ==

IGT patchset build failed on latest successful build
209230467200f2fa63a6f71fe6299996470dd813 test/i915/i915_suspend: Use SUSPEND_STATE_S3 to enforce S3.

297/329 testcase check amdgpu/amd_basic               OK               0.20s
298/329 testcase check amdgpu/amd_bypass              OK               0.19s
299/329 testcase check amdgpu/amd_color               OK               0.19s
300/329 testcase check amdgpu/amd_cs_nop              OK               0.19s
301/329 testcase check amdgpu/amd_hotplug             OK               0.18s
302/329 testcase check amdgpu/amd_info                OK               0.17s
303/329 testcase check amdgpu/amd_prime               OK               0.16s
304/329 testcase check amdgpu/amd_max_bpc             OK               0.15s
305/329 testcase check amdgpu/amd_module_load         OK               0.15s
306/329 testcase check amdgpu/amd_mem_leak            OK               0.14s
307/329 testcase check amdgpu/amd_link_settings       OK               0.14s
308/329 testcase check amdgpu/amd_vrr_range           OK               0.13s
309/329 testcase check amdgpu/amd_mode_switch         OK               0.13s
310/329 testcase check amdgpu/amd_dp_dsc              OK               0.13s
311/329 testcase check amdgpu/amd_psr                 OK               0.12s
312/329 testcase check amdgpu/amd_plane               OK               0.12s
313/329 testcase check amdgpu/amd_ilr                 OK               0.11s
314/329 runner_json                                   OK               0.09s
315/329 assembler test/mov                            OK               0.08s
316/329 assembler test/frc                            OK               0.08s
317/329 assembler test/regtype                        OK               0.07s
318/329 assembler test/rndd                           OK               0.07s
319/329 assembler test/rndu                           OK               0.06s
320/329 assembler test/rnde                           OK               0.06s
321/329 assembler test/rnde-intsrc                    OK               0.05s
322/329 assembler test/rndz                           OK               0.04s
323/329 assembler test/lzd                            OK               0.04s
324/329 assembler test/not                            OK               0.04s
325/329 assembler test/immediate                      OK               0.03s
326/329 lib igt_nesting                               OK               2.25s
327/329 lib igt_fork                                  OK               2.63s
328/329 runner                                        OK               4.60s
329/329 testcase check gem_concurrent_all             OK               5.28s

Summary of Failures:

 79/329 testcase check kms_flip_event_leak            FAIL             0.42s   exit status 1


Ok:                 325 
Expected Fail:      3   
Fail:               1   
Unexpected Pass:    0   
Skipped:            0   
Timeout:            0   

Full log written to /home/cidrm/igt-gpu-tools/build/meson-logs/testlog.txt
FAILED: meson-test 
/usr/bin/meson test --no-rebuild --print-errorlogs
ninja: build stopped: subcommand failed.

Re: [igt-dev] [PATCH i-g-t] kms_flip_event_leak: Create dynamic subtests

[Modem, Bhanuprakash]

On Fri-09-09-2022 12:44 pm, Jeevan B wrote:
> Converting the existing subtests to dynamic subtests.
> 
> Signed-off-by: Jeevan B <jeevan.b@intel.com>
> ---
>   tests/kms_flip_event_leak.c | 27 ++++++++++++++++++---------
>   1 file changed, 18 insertions(+), 9 deletions(-)
> 
> diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
> index ac201293..33aa6ab3 100644
> --- a/tests/kms_flip_event_leak.c
> +++ b/tests/kms_flip_event_leak.c
> @@ -89,24 +89,33 @@ static void test(data_t *data, enum pipe pipe, igt_output_t *output)
>   	igt_remove_fb(data->drm_fd, &fb[0]);
>   }
>   
> -igt_simple_main
> +igt_main
>   {
>   	data_t data = {};
>   	igt_output_t *output;
>   	int valid_tests = 0;
>   	enum pipe pipe;
>   
> -	data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> -	kmstest_set_vt_graphics_mode();
> +	igt_fixture {
> +		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
> +		kmstest_set_vt_graphics_mode();
> +
> +		igt_display_require(&data.display, data.drm_fd);

Please add igt_disply_require_output() in igt_fixture.

> +	}
>   
> -	igt_display_require(&data.display, data.drm_fd);
>   
> -	for_each_pipe_with_valid_output(&data.display, pipe, output) {
> -		test(&data, pipe, output);
> -		valid_tests++;
> +	igt_subtest_with_dynamic("kms_flip_event_leak") {

Binary name as subtest name? Please update it "basic" or something useful.

> +		for_each_pipe_with_valid_output(&data.display, pipe, output) {
> +			igt_dynamic_f("pipe-%s", kmstest_pipe_name(pipe)) {

Please append output name to dynamic subtest.
Ex: pipe-A-DP-1

> +				test(&data, pipe, output);

Please add igt_display_reset() just before calling test() or inside the 
test() just before calling igt_output_set_pipe()

> +				valid_tests++;
> +			}
> +		}
>   	}
>   
> -	igt_require_f(valid_tests, "no valid crtc/connector combinations found\n");
> +	igt_fixture {
> +		igt_require_f(valid_tests, "no valid crtc/connector combinations found\n");

This check is not required, igt will throw SKIP if igt_dynamic*() is not 
executed.

- Bhanu

>   
> -	igt_display_fini(&data.display);
> +		igt_display_fini(&data.display);
> +	}
>   }

[igt-dev] [PATCH i-g-t] kms_flip_event_leak: Create dynamic subtests

[Jeevan B]

Converting the existing subtests to dynamic subtests.

Signed-off-by: Jeevan B <jeevan.b@intel.com>
---
 tests/kms_flip_event_leak.c | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
index ac201293..33aa6ab3 100644
--- a/tests/kms_flip_event_leak.c
+++ b/tests/kms_flip_event_leak.c
@@ -89,24 +89,33 @@ static void test(data_t *data, enum pipe pipe, igt_output_t *output)
 	igt_remove_fb(data->drm_fd, &fb[0]);
 }
 
-igt_simple_main
+igt_main
 {
 	data_t data = {};
 	igt_output_t *output;
 	int valid_tests = 0;
 	enum pipe pipe;
 
-	data.drm_fd = drm_open_driver_master(DRIVER_ANY);
-	kmstest_set_vt_graphics_mode();
+	igt_fixture {
+		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
+		kmstest_set_vt_graphics_mode();
+
+		igt_display_require(&data.display, data.drm_fd);
+	}
 
-	igt_display_require(&data.display, data.drm_fd);
 
-	for_each_pipe_with_valid_output(&data.display, pipe, output) {
-		test(&data, pipe, output);
-		valid_tests++;
+	igt_subtest_with_dynamic("kms_flip_event_leak") {
+		for_each_pipe_with_valid_output(&data.display, pipe, output) {
+			igt_dynamic_f("pipe-%s", kmstest_pipe_name(pipe)) {
+				test(&data, pipe, output);
+				valid_tests++;
+			}
+		}
 	}
 
-	igt_require_f(valid_tests, "no valid crtc/connector combinations found\n");
+	igt_fixture {
+		igt_require_f(valid_tests, "no valid crtc/connector combinations found\n");
 
-	igt_display_fini(&data.display);
+		igt_display_fini(&data.display);
+	}
 }
-- 
2.36.0