packing: Bump up to 1.3.1

[platform/upstream/libxkbcommon.git] / test / x11.c

diff --git a/test/x11.c b/test/x11.c
index 232e136..3742a0b 100644 (file)
--- a/test/x11.c
+++ b/test/x11.c
@@ -21,11 +21,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include "test.h"
+#include "xvfb-wrapper.h"
 #include "xkbcommon/xkbcommon-x11.h"
 
-int
-main(void)
+X11_TEST(test_basic)
 {
     struct xkb_context *ctx = test_get_context(0);
     xcb_connection_t *conn;
@@ -34,23 +36,28 @@ main(void)
     struct xkb_keymap *keymap;
     struct xkb_state *state;
     char *dump;
+    int exit_code = 0;
 
     /*
     * The next two steps depend on a running X server with XKB support.
     * If it fails, it's not necessarily an actual problem with the code.
     * So we don't want a FAIL here.
     */
-    conn = xcb_connect(NULL, NULL);
-    if (!conn || xcb_connection_has_error(conn))
-        return SKIP_TEST;
+    conn = xcb_connect(display, NULL);
+    if (!conn || xcb_connection_has_error(conn)) {
+        exit_code = SKIP_TEST;
+        goto err_conn;
+    }
 
     ret = xkb_x11_setup_xkb_extension(conn,
                                       XKB_X11_MIN_MAJOR_XKB_VERSION,
                                       XKB_X11_MIN_MINOR_XKB_VERSION,
                                       XKB_X11_SETUP_XKB_EXTENSION_NO_FLAGS,
                                       NULL, NULL, NULL, NULL);
-    if (!ret)
-        return SKIP_TEST;
+    if (!ret) {
+        exit_code = SKIP_TEST;
+        goto err_conn;
+    }
 
     device_id = xkb_x11_get_core_keyboard_device_id(conn);
     assert(device_id != -1);
@@ -71,8 +78,13 @@ main(void)
     free(dump);
     xkb_state_unref(state);
     xkb_keymap_unref(keymap);
+err_conn:
     xcb_disconnect(conn);
     xkb_context_unref(ctx);
 
-    return 0;
+    return exit_code;
+}
+
+int main(void) {
+    return x11_tests_run();
 }