From 86f60ee593e3fb6808150d63088e508cf7068a75 Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Mon, 26 Aug 2013 17:15:46 +0300 Subject: [PATCH] tests/kms_setmode: don't save/restore vt graphics for dry-run Signed-off-by: Imre Deak --- lib/drmtest.c | 6 +++--- tests/kms_setmode.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/drmtest.c b/lib/drmtest.c index ad91c657..37d7da32 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -744,12 +744,12 @@ int igt_subtest_init_parse_opts(int argc, char **argv, break; case 'h': print_usage(command_str, help_str, false); - ret = -2; + ret = -1; goto out; case '?': if (opterr) { print_usage(command_str, help_str, true); - ret = -1; + ret = -2; goto out; } /* @@ -779,7 +779,7 @@ void igt_subtest_init(int argc, char **argv) ret = igt_subtest_init_parse_opts(argc, argv, NULL, NULL, NULL, NULL); if (ret < 0) /* exit with no error for -h/--help */ - exit(ret == -2 ? 0 : ret); + exit(ret == -1 ? 0 : ret); /* reset opt parsing */ optind = 1; diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c index 47fab25a..7b222255 100644 --- a/tests/kms_setmode.c +++ b/tests/kms_setmode.c @@ -701,7 +701,8 @@ int main(int argc, char **argv) igt_fixture { drm_fd = drm_open_any(); - do_or_die(igt_set_vt_graphics_mode()); + if (!dry_run) + do_or_die(igt_set_vt_graphics_mode()); drm_resources = drmModeGetResources(drm_fd); assert(drm_resources);