From 89cf0dc43171c9d2b708cd8c9de27593f1338097 Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Fri, 2 Sep 2011 09:54:39 -0500 Subject: Make building for GTK optional --- tests/Makefile.am | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index a4763da..e6882af 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,13 +13,17 @@ TESTS = \ test-glib-proxy \ test-glib-simple-items \ test-glib-submenu \ - test-json \ + test-json + +if WANT_LIBDBUSMENUGTK +TESTS += \ test-gtk-objects-test \ test-gtk-label \ test-gtk-shortcut \ test-gtk-reorder \ test-gtk-submenu \ test-gtk-parser-test +endif XFAIL_TESTS = \ test-glib-proxy @@ -44,20 +48,24 @@ check_PROGRAMS = \ test-glib-proxy-client \ test-glib-proxy-server \ test-glib-proxy-proxy \ - test-gtk-objects \ test-glib-submenu-client \ test-glib-submenu-server \ + test-glib-simple-items \ + test-json-client \ + test-json-server + +if WANT_LIBDBUSMENUGTK +check_PROGRAMS += \ + test-gtk-objects \ test-gtk-label-client \ test-gtk-label-server \ test-gtk-shortcut-client \ test-gtk-shortcut-server \ - test-glib-simple-items \ test-gtk-reorder-server \ - test-json-client \ - test-json-server \ test-gtk-submenu-server \ test-gtk-submenu-client \ test-gtk-parser +endif XVFB_RUN=". $(srcdir)/run-xvfb.sh" -- cgit v1.2.3 From 0b5f7ed8fcaee4b32db7a1deed1b65ff77688551 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 19 Sep 2011 13:13:49 -0500 Subject: Making sure to sink the reference before parsing it. --- tests/test-gtk-parser.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests') diff --git a/tests/test-gtk-parser.c b/tests/test-gtk-parser.c index 87b0a7f..afd6194 100644 --- a/tests/test-gtk-parser.c +++ b/tests/test-gtk-parser.c @@ -28,6 +28,8 @@ test_parser_runs (void) { GtkWidget * gmi = gtk_menu_item_new_with_label("Test Item"); g_assert(gmi != NULL); + g_object_ref_sink(gmi); + DbusmenuMenuitem * mi = dbusmenu_gtk_parse_menu_structure(gmi); g_assert(mi != NULL); -- cgit v1.2.3 From 4177700e45a02a7f35b32dc24dd7ec6e150d6a0a Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Mon, 19 Sep 2011 23:43:26 -0500 Subject: Adding an optional build of the dumper --- tests/Makefile.am | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index e6882af..a4e8682 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,8 +12,12 @@ TESTS = \ test-glib-properties \ test-glib-proxy \ test-glib-simple-items \ - test-glib-submenu \ + test-glib-submenu + +if WANT_DBUSMENUDUMPER +TESTS += \ test-json +endif if WANT_LIBDBUSMENUGTK TESTS += \ @@ -50,9 +54,13 @@ check_PROGRAMS = \ test-glib-proxy-proxy \ test-glib-submenu-client \ test-glib-submenu-server \ - test-glib-simple-items \ + test-glib-simple-items + +if WANT_DBUSMENUDUMPER +check_PROGRAMS += \ test-json-client \ test-json-server +endif if WANT_LIBDBUSMENUGTK check_PROGRAMS += \ -- cgit v1.2.3