From f56ed6b1dd22863399bb83ab8f39ff72eab805c4 Mon Sep 17 00:00:00 2001
From: Petri Latvala <petri.latvala@intel.com>
Date: Thu, 17 Oct 2019 12:17:12 +0300
Subject: [PATCH] kms_busy: Rename tests so pipe-specific subtests are
blacklistable
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@intel.com>
Cc: Martin Peres <martin.peres@linux.intel.com>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
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 faad73092..b44b0bf18 100644
--- a/tests/kms_busy.c
+++ b/tests/kms_busy.c
@@ -313,13 +313,13 @@ 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, eb_ring(e)));
test_flip(&display, eb_ring(e), 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, eb_ring(e)));
@@ -332,7 +332,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, eb_ring(e)));
@@ -342,23 +342,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, eb_ring(e), 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, eb_ring(e), 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, eb_ring(e), 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, eb_ring(e), 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);
@@ -367,7 +367,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);
--
GitLab