tests/kms_force_connector: reset connectors and edid on exit

Signed-off-by: Thomas Wood <thomas.wood@intel.com>
This commit is contained in:
Thomas Wood 2015-11-10 14:16:00 +00:00
parent a8f6357430
commit 3dce57a699

View File

@ -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.hdisplay, h); igt_assert_eq(m.vdisplay, w); \
igt_assert_eq(m.vrefresh, r); igt_assert_eq(m.vrefresh, r);
static void __attribute__((noreturn)) reset_connectors(void) static void reset_connectors(void)
{ {
int drm_fd = 0; int drm_fd = 0;
drmModeRes *res; drmModeRes *res;
@ -51,8 +51,6 @@ static void __attribute__((noreturn)) reset_connectors(void)
drmModeFreeConnector(connector); drmModeFreeConnector(connector);
} }
exit(0);
} }
static int opt_handler(int opt, int opt_index, void *data) 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) { switch (opt) {
case 'r': case 'r':
reset_connectors(); reset_connectors();
exit(0);
break; break;
} }
@ -172,6 +171,9 @@ int main(int argc, char **argv)
igt_fixture { igt_fixture {
drmModeFreeConnector(vga_connector); drmModeFreeConnector(vga_connector);
close(drm_fd);
reset_connectors();
} }
igt_exit(); igt_exit();