[gtk+] Skip GdkX11GLContext in some object tests
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Skip GdkX11GLContext in some object tests
- Date: Wed, 22 Oct 2014 05:16:46 +0000 (UTC)
commit 0f309c9dcf36062d82242e98c2ec09fa1dc0330e
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Oct 21 23:46:11 2014 -0400
Skip GdkX11GLContext in some object tests
Since it can't be constructed without specifying a GdkWindow,
which we don't have here.
testsuite/gtk/notify.c | 3 ++-
testsuite/gtk/objects-finalize.c | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index a5d421b..1ff660c 100644
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -389,7 +389,8 @@ test_type (gconstpointer data)
g_str_equal (g_type_name (type), "GdkX11DeviceManagerXI2") ||
g_str_equal (g_type_name (type), "GdkX11Display") ||
g_str_equal (g_type_name (type), "GdkX11DisplayManager") ||
- g_str_equal (g_type_name (type), "GdkX11Screen"))
+ g_str_equal (g_type_name (type), "GdkX11Screen") ||
+ g_str_equal (g_type_name (type), "GdkX11GLContext"))
return;
/* This throws a critical when the connection is dropped */
diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
index fd28f88..3568505 100644
--- a/testsuite/gtk/objects-finalize.c
+++ b/testsuite/gtk/objects-finalize.c
@@ -114,6 +114,7 @@ main (int argc, char **argv)
all_types[i] != GDK_TYPE_X11_DISPLAY &&
all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 &&
all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER &&
+ all_types[i] != GDK_TYPE_X11_GL_CONTEXT &&
#endif
/* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */
all_types[i] != GDK_TYPE_PIXBUF_LOADER &&
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]