cursor hidden and tablet support

1 files changed, 43 insertions, 1 deletions

diff --git a/tests/meson.build b/tests/meson.build
index 0f28c39..177e400 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -84,12 +84,43 @@ selection_test = executable(
 )
 test('selection', selection_test)
 
+tablet_example_test = executable('yasl-tablet-example-test', 'common/test_tablet_example.c',
+    dependencies: yasl_dep,
+)
+test('tablet-example', tablet_example_test)
+
+if has_x11
+    tablet_x11_test = executable('yasl-tablet-x11-test', 'x11/test_tablet.c',
+        include_directories: inc, dependencies: yasl_dep,
+    )
+    test('tablet-x11', tablet_x11_test)
+    if get_option('x11_tablet_tests')
+        xorg = find_program('/usr/lib/Xorg', '/usr/lib/xorg/Xorg', 'Xorg')
+        native_tablet_test = executable('yasl-tablet-x11-native-test', 'x11/test_tablet_native.c',
+            dependencies: yasl_dep,
+        )
+        test('tablet-x11-native', python,
+            args: [files('helpers/run_x11_tablet.py'), xorg, native_tablet_test], timeout: 30,
+        )
+    endif
+elif get_option('x11_tablet_tests')
+    error('Native X11 tablet tests require the X11 backend.')
+endif
+
 if has_wayland
     ime_test = executable('yasl-ime-test', 'wayland/test_input.c',
         include_directories: inc,
         dependencies: yasl_dep,
     )
     test('ime-ownership', ime_test)
+    tablet_wayland_test = executable('yasl-tablet-wayland-test', 'wayland/test_tablet.c',
+        include_directories: inc, dependencies: yasl_dep,
+    )
+    test('tablet-wayland', tablet_wayland_test)
+    cursor_wayland_test = executable('yasl-cursor-wayland-test', 'wayland/test_cursor.c',
+        include_directories: inc, dependencies: yasl_dep,
+    )
+    test('cursor-wayland', cursor_wayland_test)
 endif
 
 if get_option('integration_tests')
@@ -102,6 +133,17 @@ if get_option('integration_tests')
             dependencies: [shared_dep, deps],
         )
         test('native-ownership', ownership_test, timeout: 20)
+        tablet_cocoa_test = executable('yasl-tablet-cocoa-test', 'cocoa/test_tablet.m',
+            dependencies: [shared_dep, deps],
+        )
+        test('tablet-cocoa', tablet_cocoa_test, timeout: 20)
+        cursor_cocoa_test = executable('yasl-cursor-cocoa-test', 'cocoa/test_cursor.m',
+            dependencies: [shared_dep, deps],
+        )
+        test('cursor-cocoa', cursor_cocoa_test, timeout: 20)
+        test('tablet-cocoa-window', tablet_example,
+            args: ['--backend', 'cocoa', '--smoke-test'], timeout: 20,
+        )
     else
         if not has_wayland or not has_x11
             error('Linux integration tests require Wayland and X11.')
@@ -115,7 +157,7 @@ if get_option('integration_tests')
         xwayland = find_program('Xwayland')
         test('backends', python,
             args: [files('helpers/run_backends.py'), weston, xwayland,
-                   backend_test, timer_test],
+                   backend_test, timer_test, tablet_example],
             timeout: 60,
         )
     endif