Merge branch 'x11_prepare' into 'master'

Cleanups leading to Xwayland compatibility See merge request Librem5/squeekboard!389
2020-10-12 12:45:13 +00:00
parent f64e5a3627 8f526bd357
commit 2f613ea4c7
7 changed files with 106 additions and 47 deletions
--- a/tests/meson.build
+++ b/tests/meson.build
@ -69,11 +69,17 @@ foreach layout : [

    'emoji',
 ]
+    extra = []
+    if layout == 'emoji'
+        extra += ['allow_missing_return']
+    endif
+
    test(
        'test_layout_' + layout,
        cargo_script,
        args: ['run'] + cargo_build_flags
-            + [ '--example', 'test_layout', '--', layout],
+            + ['--example', 'test_layout', '--', layout]
+            + extra,
        workdir: meson.build_root(),
    )
 endforeach