test: move the quirks context init into litest_run
authorPeter Hutterer <peter.hutterer@who-t.net>
Wed, 16 Oct 2024 01:18:24 +0000 (11:18 +1000)
committerMarge Bot <emma+marge@anholt.net>
Wed, 30 Oct 2024 23:20:42 +0000 (23:20 +0000)
Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1067>

test/litest.c

index 00e069cca162ee3a777db2315b56b381f0503c6c..5aff0d57acc80841daf90f644e1f1dd111da74a0 100644 (file)
@@ -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);