From 3dce57a699e1481bbe7b2e4c52a7643654e2da19 Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Tue, 10 Nov 2015 14:16:00 +0000 Subject: [PATCH] tests/kms_force_connector: reset connectors and edid on exit Signed-off-by: Thomas Wood --- tests/kms_force_connector.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/kms_force_connector.c b/tests/kms_force_connector.c index 997ae881..838a3b0a 100644 --- a/tests/kms_force_connector.c +++ b/tests/kms_force_connector.c @@ -31,7 +31,7 @@ IGT_TEST_DESCRIPTION("Check the debugfs force connector/edid features work" igt_assert_eq(m.hdisplay, h); igt_assert_eq(m.vdisplay, w); \ igt_assert_eq(m.vrefresh, r); -static void __attribute__((noreturn)) reset_connectors(void) +static void reset_connectors(void) { int drm_fd = 0; drmModeRes *res; @@ -51,8 +51,6 @@ static void __attribute__((noreturn)) reset_connectors(void) drmModeFreeConnector(connector); } - - exit(0); } static int opt_handler(int opt, int opt_index, void *data) @@ -60,6 +58,7 @@ static int opt_handler(int opt, int opt_index, void *data) switch (opt) { case 'r': reset_connectors(); + exit(0); break; } @@ -172,6 +171,9 @@ int main(int argc, char **argv) igt_fixture { drmModeFreeConnector(vga_connector); + close(drm_fd); + + reset_connectors(); } igt_exit();