summaryrefslogtreecommitdiff
path: root/testsuite/gtk/meson.build
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-03-19 19:35:42 +0000
committerMatthias Clasen <mclasen@redhat.com>2020-03-19 19:35:42 +0000
commit3ac4c76b18cc89a841ce09f0943539f16988fd21 (patch)
tree1d5e0d0a4fe8a883768e5f07da05c0192458f3d2 /testsuite/gtk/meson.build
parent6ec96d2e989d029a303b8b20ec72b86f974c0e87 (diff)
parent89b537bd8a89c87c6c16baf2c6395164ecc40410 (diff)
downloadgtk+-3ac4c76b18cc89a841ce09f0943539f16988fd21.tar.gz
Merge branch 'disable-window-test' into 'master'
Disable window test See merge request GNOME/gtk!1540
Diffstat (limited to 'testsuite/gtk/meson.build')
-rw-r--r--testsuite/gtk/meson.build6
1 files changed, 5 insertions, 1 deletions
diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build
index 983a33ffad..15c32cd2a3 100644
--- a/testsuite/gtk/meson.build
+++ b/testsuite/gtk/meson.build
@@ -17,6 +17,7 @@ tests = [
['builderparser'],
['cellarea'],
['check-icon-names'],
+ ['concatmodel', ['../../gtk/gtkconcatmodel.c'], ['-DGTK_COMPILATION', '-UG_ENABLE_DEBUG']],
['constraint-solver', [
'../../gtk/gtkconstraintsolver.c',
'../../gtk/gtkconstraintexpression.c',
@@ -64,7 +65,6 @@ tests = [
['treepath'],
['treeview'],
['typename'],
- ['window'],
['displayclose'],
['revealer-size'],
['widgetorder'],
@@ -72,6 +72,10 @@ tests = [
# Tests that are expected to fail
xfail = [
+ # one of the window resizing tests fails after
+ # the GdkToplevel refactoring, and needs a big
+ # gtkwindow.c configure request cleanup
+ 'window',
]
is_debug = get_option('buildtype').startswith('debug')