From b99a4da939b1acfa7459b45b97f02f7220ceb414 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue, 11 Feb 2020 14:53:57 +0000
Subject: [PATCH] testsuite/gtk: Add xfail tests

Some tests are expected to fail.

Some tests are expected to fail in non-debugging builds.

The icontheme test is the latter.
---
 testsuite/gtk/meson.build | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build
index 4255d8817f..02d38cbece 100644
--- a/testsuite/gtk/meson.build
+++ b/testsuite/gtk/meson.build
@@ -70,6 +70,17 @@ tests = [
   ['widgetorder'],
 ]
 
+# Tests that are expected to fail
+xfail = [
+]
+
+# Tests that are expected to fail on non-debug builds
+xfail_nodebug = [
+  'icontheme', # Overrides debugging messages
+]
+
+is_debug = get_option('buildtype').startswith('debug')
+
 test_cargs = []
 
 if os_unix
@@ -90,6 +101,11 @@ foreach t : tests
     install: get_option('install-tests'),
     install_dir: testexecdir)
 
+  expect_fail = xfail.contains(test_name)
+  if not is_debug
+    expect_fail = xfail_nodebug.contains(test_name)
+  endif
+
   test(test_name, test_exe,
        args: [ '--tap', '-k' ],
        env: [ 'GIO_USE_VOLUME_MONITOR=unix',
@@ -102,7 +118,9 @@ foreach t : tests
               'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
               'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir),
             ],
-       suite: 'gtk')
+       suite: 'gtk',
+       should_fail: expect_fail,
+  )
 endforeach
 
 # FIXME: if objc autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1 -x objective-c++