[igt-dev] [PATCH i-g-t 1/2] kms_busy: Rename tests so pipe-specific subtests are blacklistable

Petri Latvala petri.latvala at intel.com
Thu Oct 17 09:17:12 UTC 2019


The blacklist for pipes E and F are not capturing kms_busy's usage of
them, because of the differing naming convention. Make that more
uniform.

Signed-off-by: Petri Latvala <petri.latvala at intel.com>
Cc: Martin Peres <martin.peres at linux.intel.com>
---

Martin, test renaming here. Needs your ack for the cibuglog changes
needed.

tests/kms_busy.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/kms_busy.c b/tests/kms_busy.c
index 5ff2b846..1426a5f0 100644
--- a/tests/kms_busy.c
+++ b/tests/kms_busy.c
@@ -313,14 +313,14 @@ igt_main
 			igt_display_require_output_on_pipe(&display, n);
 		}
 
-		igt_subtest_f("basic-flip-%s",
+		igt_subtest_f("basic-flip-pipe-%s",
 			kmstest_pipe_name(n)) {
 			igt_require(gem_has_ring(display.drm_fd,
 						e->exec_id | e->flags));
 
 			test_flip(&display, e->exec_id | e->flags, n, false);
 		}
-		igt_subtest_f("basic-modeset-%s",
+		igt_subtest_f("basic-modeset-pipe-%s",
 			kmstest_pipe_name(n)) {
 			igt_require(gem_has_ring(display.drm_fd,
 						e->exec_id | e->flags));
@@ -335,7 +335,7 @@ igt_main
 			hang = igt_allow_hang(display.drm_fd, 0, 0);
 		}
 
-		igt_subtest_f("extended-pageflip-modeset-hang-oldfb-%s-%s",
+		igt_subtest_f("extended-pageflip-modeset-hang-oldfb-%s-pipe-%s",
 				e->name, kmstest_pipe_name(n)) {
 			igt_require(gem_has_ring(display.drm_fd,
 						e->exec_id | e->flags));
@@ -346,23 +346,23 @@ igt_main
 		igt_fixture
 			igt_require(display.is_atomic);
 
-		igt_subtest_f("extended-pageflip-hang-oldfb-%s-%s",
+		igt_subtest_f("extended-pageflip-hang-oldfb-%s-pipe-%s",
 				e->name, kmstest_pipe_name(n))
 			test_hang(&display, e->exec_id | e->flags, n, false, false);
 
-		igt_subtest_f("extended-pageflip-hang-newfb-%s-%s",
+		igt_subtest_f("extended-pageflip-hang-newfb-%s-pipe-%s",
 				e->name, kmstest_pipe_name(n))
 			test_hang(&display, e->exec_id | e->flags, n, false, true);
 
-		igt_subtest_f("extended-modeset-hang-oldfb-%s-%s",
+		igt_subtest_f("extended-modeset-hang-oldfb-%s-pipe-%s",
 				e->name, kmstest_pipe_name(n))
 			test_hang(&display, e->exec_id | e->flags, n, true, false);
 
-		igt_subtest_f("extended-modeset-hang-newfb-%s-%s",
+		igt_subtest_f("extended-modeset-hang-newfb-%s-pipe-%s",
 				e->name, kmstest_pipe_name(n))
 			test_hang(&display, e->exec_id | e->flags, n, true, true);
 
-		igt_subtest_f("extended-modeset-hang-oldfb-with-reset-%s-%s",
+		igt_subtest_f("extended-modeset-hang-oldfb-with-reset-%s-pipe-%s",
 				e->name, kmstest_pipe_name(n)) {
 			igt_set_module_param_int("force_reset_modeset_test", 1);
 
@@ -371,7 +371,7 @@ igt_main
 			igt_set_module_param_int("force_reset_modeset_test", 0);
 		}
 
-		igt_subtest_f("extended-modeset-hang-newfb-with-reset-%s-%s",
+		igt_subtest_f("extended-modeset-hang-newfb-with-reset-%s-pipe-%s",
 				e->name, kmstest_pipe_name(n)) {
 			igt_set_module_param_int("force_reset_modeset_test", 1);
 
-- 
2.19.1



More information about the igt-dev mailing list