From f525f9f0403c4881f32e65234d2647cd67dc826c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 23 Jun 2020 16:25:50 +1000
Subject: [PATCH] test: disentangle interactive-wayland from the test headers

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 meson.build                |  5 ++++-
 test/interactive-wayland.c | 12 ++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/meson.build b/meson.build
index 1f9fb78..b89d58f 100644
--- a/meson.build
+++ b/meson.build
@@ -501,7 +501,10 @@ You can disable the Wayland demo programs with -Denable-wayland=false.''')
         wayland_scanner_code_gen.process(xdg_shell_xml),
         wayland_scanner_client_header_gen.process(xdg_shell_xml),
     ]
-    executable('interactive-wayland', 'test/interactive-wayland.c', xdg_shell_sources, dependencies: [test_dep, wayland_client_dep])
+    executable('interactive-wayland',
+               'test/interactive-wayland.c',
+               xdg_shell_sources,
+               dependencies: [tools_dep, wayland_client_dep])
 endif
 
 # xkeyboard-config "verifier"
diff --git a/test/interactive-wayland.c b/test/interactive-wayland.c
index ab83e71..0ffccd0 100644
--- a/test/interactive-wayland.c
+++ b/test/interactive-wayland.c
@@ -33,7 +33,7 @@
 #include <sys/mman.h>
 
 #include "xkbcommon/xkbcommon.h"
-#include "test.h"
+#include "tools-common.h"
 
 #include <wayland-client.h>
 #include "xdg-shell-client-protocol.h"
@@ -377,8 +377,8 @@ kbd_key(void *data, struct wl_keyboard *wl_kbd, uint32_t serial, uint32_t time,
         return;
 
     printf("%s: ", seat->name_str);
-    test_print_keycode_state(seat->state, NULL, key + 8,
-                             XKB_CONSUMED_MODE_XKB);
+    tools_print_keycode_state(seat->state, NULL, key + 8,
+                              XKB_CONSUMED_MODE_XKB);
 
     /* Exit on ESC. */
     if (xkb_state_key_get_one_sym(seat->state, key + 8) == XKB_KEY_Escape)
@@ -669,7 +669,7 @@ main(int argc, char *argv[])
         goto err_out;
     }
 
-    inter.ctx = test_get_context(0);
+    inter.ctx = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
     if (!inter.ctx) {
         ret = -1;
         fprintf(stderr, "Couldn't create xkb context\n");
@@ -698,11 +698,11 @@ main(int argc, char *argv[])
 
     surface_create(&inter);
 
-    test_disable_stdin_echo();
+    tools_disable_stdin_echo();
     do {
         ret = wl_display_dispatch(inter.dpy);
     } while (ret >= 0 && !terminate);
-    test_enable_stdin_echo();
+    tools_enable_stdin_echo();
 
     wl_registry_destroy(registry);
 err_conn: