From 065d73619f33c3ac92c80d06b7a48992406940cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Fri, 8 Jan 2016 20:37:51 +0200 Subject: [PATCH] tests/kms_chv_cursor_fail: Skip when the pipe doesn't exist MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Looks like I fumbled things when I made kms_chv_cursor_fail iterate over all pipes. It fails to check that the pipe actually exists, and so fails on < 3 pipe platforms. Add the necessary checks to skip on non-existing pipes. Signed-off-by: Ville Syrjälä --- tests/kms_chv_cursor_fail.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/kms_chv_cursor_fail.c b/tests/kms_chv_cursor_fail.c index 2ccdd410..83af07f9 100644 --- a/tests/kms_chv_cursor_fail.c +++ b/tests/kms_chv_cursor_fail.c @@ -394,24 +394,28 @@ int main(int argc, char **argv) igt_subtest_f("pipe-%s-%dx%d-left-edge", kmstest_pipe_name(data.pipe), data.curw, data.curh) { + igt_require(data.pipe < data.display.n_pipes); igt_require(data.curw <= max_curw && data.curh <= max_curh); test_crtc(&data, EDGE_LEFT); } igt_subtest_f("pipe-%s-%dx%d-right-edge", kmstest_pipe_name(data.pipe), data.curw, data.curh) { + igt_require(data.pipe < data.display.n_pipes); igt_require(data.curw <= max_curw && data.curh <= max_curh); test_crtc(&data, EDGE_RIGHT); } igt_subtest_f("pipe-%s-%dx%d-top-edge", kmstest_pipe_name(data.pipe), data.curw, data.curh) { + igt_require(data.pipe < data.display.n_pipes); igt_require(data.curw <= max_curw && data.curh <= max_curh); test_crtc(&data, EDGE_TOP); } igt_subtest_f("pipe-%s-%dx%d-bottom-edge", kmstest_pipe_name(data.pipe), data.curw, data.curh) { + igt_require(data.pipe < data.display.n_pipes); igt_require(data.curw <= max_curw && data.curh <= max_curh); test_crtc(&data, EDGE_BOTTOM); }