From 9928de7fa38dcbeaad51016ca58e299b8235f1d8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 16 Oct 2024 11:18:24 +1000 Subject: [PATCH] test: move the quirks context init into litest_run Part-of: --- test/litest.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/test/litest.c b/test/litest.c index 00e069cc..5aff0d57 100644 --- a/test/litest.c +++ b/test/litest.c @@ -1027,19 +1027,8 @@ litest_run_suite(struct list *suites, int njobs) } } - if (ntests > 0) { - const char *data_path = getenv("LIBINPUT_QUIRKS_DIR"); - if (!data_path) - data_path = LIBINPUT_QUIRKS_DIR; - - quirks_context = quirks_init_subsystem(data_path, - NULL, - quirk_log_handler, - NULL, - QLOG_LIBINPUT_LOGGING); + if (ntests > 0) result = litest_runner_run_tests(runner); - quirks_context_unref(quirks_context); - } litest_runner_destroy(runner); @@ -1121,8 +1110,20 @@ litest_run(struct list *suites) inhibit_lock_fd = inhibit(); + const char *data_path = getenv("LIBINPUT_QUIRKS_DIR"); + if (!data_path) + data_path = LIBINPUT_QUIRKS_DIR; + + quirks_context = quirks_init_subsystem(data_path, + NULL, + quirk_log_handler, + NULL, + QLOG_LIBINPUT_LOGGING); + enum litest_runner_result result = litest_run_suite(suites, jobs); + quirks_context_unref(quirks_context); + close(inhibit_lock_fd); litest_remove_udev_rules(&created_files_list); -- 2.34.1