From e3f39bf0c3ef083f096854b021a2c6f6c54f8918 Mon Sep 17 00:00:00 2001 From: "g.willems" Date: Tue, 12 Dec 2023 21:29:03 +0100 Subject: [PATCH] testsuite: only run x11-specific tests if x11 enabled Some testcases rely on X11 support, which is not always available, typically on win32. Skip them if the x11 backend is disabled. --- testsuite/gdk/meson.build | 9 +++++++-- testsuite/gtk/meson.build | 7 ++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/testsuite/gdk/meson.build b/testsuite/gdk/meson.build index 37429161b9..8ca0c2036f 100644 --- a/testsuite/gdk/meson.build +++ b/testsuite/gdk/meson.build @@ -13,9 +13,7 @@ tests = [ { 'name': 'contentformats' }, { 'name': 'contentserializer' }, { 'name': 'cursor' }, - { 'name': 'display' }, { 'name': 'displaymanager' }, - { 'name': 'encoding' }, { 'name': 'glcontext' }, { 'name': 'keysyms' }, { 'name': 'memorytexture' }, @@ -27,6 +25,13 @@ tests = [ { 'name': 'popuplayout' }, ] +if x11_enabled + tests += [ + { 'name': 'display' }, + { 'name': 'encoding' }, + ] +endif + foreach t : tests test_name = t.get('name') test_exe = executable(test_name, diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build index 12b025f317..744738da74 100644 --- a/testsuite/gtk/meson.build +++ b/testsuite/gtk/meson.build @@ -100,12 +100,17 @@ tests = [ { 'name': 'treesorter' }, { 'name': 'treeview' }, { 'name': 'typename' }, - { 'name': 'displayclose' }, { 'name': 'revealer-size' }, { 'name': 'widgetorder' }, { 'name': 'widget-refcount' }, ] +if x11_enabled + tests += [ + { 'name': 'displayclose' }, + ] +endif + # Tests that test private apis and therefore are linked against libgtk-4.a internal_tests = [ { 'name': 'bitmask' },