From 70a6467b3615f49934a528a1eb6c96d0686e9f17 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Thu, 28 Feb 2019 15:19:16 +0100 Subject: tests/kms_lease: Adjust to kernel errno changes I dropped a superfluous check for negative object id (the kernel did a cast to s32, despite that object ids are always unsigned). Which changes the errno from EINVAL to ENOENT. Allow both. Reviewed-by: Boris Brezillon Signed-off-by: Daniel Vetter --- tests/kms_lease.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'tests/kms_lease.c') diff --git a/tests/kms_lease.c b/tests/kms_lease.c index 6967c489..c2671d57 100644 --- a/tests/kms_lease.c +++ b/tests/kms_lease.c @@ -714,6 +714,10 @@ static void lease_again(data_t *data) terminate_lease(&lease_b); } +#define assert_unleased(ret) \ + igt_assert_f((ret) == -EINVAL || (ret) == -ENOENT, \ + "wrong return code %i, %s\n", ret, \ + strerror(ret)) /* Test leasing an invalid connector */ static void lease_invalid_connector(data_t *data) { @@ -726,7 +730,7 @@ static void lease_invalid_connector(data_t *data) data->connector_id = 0xbaadf00d; ret = make_lease(data, &lease); data->connector_id = save_connector_id; - igt_assert_eq(ret, -EINVAL); + assert_unleased(ret); } /* Test leasing an invalid crtc */ @@ -741,7 +745,7 @@ static void lease_invalid_crtc(data_t *data) data->crtc_id = 0xbaadf00d; ret = make_lease(data, &lease); data->crtc_id = save_crtc_id; - igt_assert_eq(ret, -EINVAL); + assert_unleased(ret); } static void lease_invalid_plane(data_t *data) @@ -755,7 +759,7 @@ static void lease_invalid_plane(data_t *data) data->plane_id = 0xbaadf00d; ret = make_lease(data, &lease); data->plane_id = save_plane_id; - igt_assert_eq(ret, -EINVAL); + assert_unleased(ret); } -- cgit v1.2.3