From 3adbe54eacbb8dd3f23f9a4d1171ec0704a7fffb Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 23 Jun 2020 16:20:08 +1000
Subject: [PATCH] tools: move the remaining tools from test to here

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 doc/quick-guide.md                    | 6 +++---
 meson.build                           | 6 +++---
 {test => tools}/interactive-evdev.c   | 0
 {test => tools}/interactive-wayland.c | 0
 {test => tools}/interactive-x11.c     | 2 +-
 xkbcommon/xkbcommon-x11.h             | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename {test => tools}/interactive-evdev.c (100%)
 rename {test => tools}/interactive-wayland.c (100%)
 rename {test => tools}/interactive-x11.c (99%)

diff --git a/doc/quick-guide.md b/doc/quick-guide.md
index 9d66475..eb1a757 100644
--- a/doc/quick-guide.md
+++ b/doc/quick-guide.md
@@ -16,11 +16,11 @@ the library. We will employ a few use-cases to lead the examples:
 The snippets are not complete, and some support code is omitted. You
 can find complete and more complex examples in the source directory:
 
-1. test/interactive-evdev.c contains an interactive evdev client.
+1. tools/interactive-evdev.c contains an interactive evdev client.
 
-2. test/interactive-x11.c contains an interactive X11 client.
+2. tools/interactive-x11.c contains an interactive X11 client.
 
-3. test/interactive-wayland.c contains an interactive Wayland client.
+3. tools/interactive-wayland.c contains an interactive Wayland client.
 
 Also, the library contains many more functions for examining and using
 the library context, the keymap and the keyboard state. See the
diff --git a/meson.build b/meson.build
index b89d58f..3f2d8ca 100644
--- a/meson.build
+++ b/meson.build
@@ -462,7 +462,7 @@ if cc.has_header_symbol('getopt.h', 'getopt_long', prefix: '#define _GNU_SOURCE'
     executable('how-to-type', 'tools/how-to-type.c', dependencies: tools_dep)
 endif
 if cc.has_header('linux/input.h')
-    executable('interactive-evdev', 'test/interactive-evdev.c', dependencies: tools_dep)
+    executable('interactive-evdev', 'tools/interactive-evdev.c', dependencies: tools_dep)
 endif
 if get_option('enable-x11')
     x11_tools_dep = declare_dependency(
@@ -473,7 +473,7 @@ if get_option('enable-x11')
             xcb_xkb_dep,
         ],
     )
-    executable('interactive-x11', 'test/interactive-x11.c', dependencies: x11_tools_dep)
+    executable('interactive-x11', 'tools/interactive-x11.c', dependencies: x11_tools_dep)
 endif
 if get_option('enable-wayland')
     wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false)
@@ -502,7 +502,7 @@ You can disable the Wayland demo programs with -Denable-wayland=false.''')
         wayland_scanner_client_header_gen.process(xdg_shell_xml),
     ]
     executable('interactive-wayland',
-               'test/interactive-wayland.c',
+               'tools/interactive-wayland.c',
                xdg_shell_sources,
                dependencies: [tools_dep, wayland_client_dep])
 endif
diff --git a/test/interactive-evdev.c b/tools/interactive-evdev.c
similarity index 100%
rename from test/interactive-evdev.c
rename to tools/interactive-evdev.c
diff --git a/test/interactive-wayland.c b/tools/interactive-wayland.c
similarity index 100%
rename from test/interactive-wayland.c
rename to tools/interactive-wayland.c
diff --git a/test/interactive-x11.c b/tools/interactive-x11.c
similarity index 99%
rename from test/interactive-x11.c
rename to tools/interactive-x11.c
index 8d312b7..4cc24d8 100644
--- a/test/interactive-x11.c
+++ b/tools/interactive-x11.c
@@ -33,7 +33,7 @@
 /*
  * Note: This program only handles the core keyboard device for now.
  * It should be straigtforward to change struct keyboard to a list of
- * keyboards with device IDs, as in test/interactive-evdev.c. This would
+ * keyboards with device IDs, as in tools/interactive-evdev.c. This would
  * require:
  *
  * - Initially listing the keyboard devices.
diff --git a/xkbcommon/xkbcommon-x11.h b/xkbcommon/xkbcommon-x11.h
index cf244d2..4eb716a 100644
--- a/xkbcommon/xkbcommon-x11.h
+++ b/xkbcommon/xkbcommon-x11.h
@@ -54,7 +54,7 @@ extern "C" {
  * can be used as a replacement for Xlib's keyboard handling.
  *
  * Following is an example workflow using xkbcommon-x11.  A complete
- * example may be found in the test/interactive-x11.c file in the
+ * example may be found in the tools/interactive-x11.c file in the
  * xkbcommon source repository.  On startup:
  *
  * 1. Connect to the X server using xcb_connect().
-- 
2.7.4