diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2018-06-25 16:06:34 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2018-06-26 13:51:23 +1000 |
| commit | 76233364b17c3228f27873e478fc8be3b0c1602f (patch) | |
| tree | a8540003e67868cd8ee089ff037944184363a290 /test | |
| parent | 237ebb7cc4e9bf035891176acb08b1bf558ee989 (diff) | |
test: parse arguments before any other stuff
If the args are bad, we don't need to check for root and whatnot.
Only exception here is the debugger check because it changes defaults that we
may want to override with commandline arguments later.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'test')
| -rw-r--r-- | test/litest.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/litest.c b/test/litest.c index a73ff6fd..dab62c4a 100644 --- a/test/litest.c +++ b/test/litest.c @@ -3988,6 +3988,14 @@ main(int argc, char **argv) int failed_tests; int rc; + in_debugger = is_debugger_attached(); + if (in_debugger) + setenv("CK_FORK", "no", 0); + + mode = litest_parse_argv(argc, argv); + if (mode == LITEST_MODE_ERROR) + return EXIT_FAILURE; + rc = check_device_access(); if (rc != 0) return rc; @@ -3999,14 +4007,6 @@ main(int argc, char **argv) setenv("CK_DEFAULT_TIMEOUT", "30", 0); setenv("LIBINPUT_RUNNING_TEST_SUITE", "1", 1); - in_debugger = is_debugger_attached(); - if (in_debugger) - setenv("CK_FORK", "no", 0); - - mode = litest_parse_argv(argc, argv); - if (mode == LITEST_MODE_ERROR) - return EXIT_FAILURE; - setup_tests(); if (mode == LITEST_MODE_LIST) { |