diff options
| author | Martin Pitt <martin@piware.de> | 2011-02-21 13:12:33 +0100 |
|---|---|---|
| committer | Martin Pitt <martin@piware.de> | 2011-02-21 13:12:33 +0100 |
| commit | ded5bb1e7c5bf42c24ed25a66c7e73ae8eaa54e0 (patch) | |
| tree | eeac4c7bace411463570b6d0b06b18264d09afe8 /tests | |
| parent | 3f3db4e1ea5e5b2321a7266edf018bb510fcdfb4 (diff) | |
| parent | 87703b408d42ce97b5a64142b0c33951d366890a (diff) | |
| download | libdbusmenu-ded5bb1e7c5bf42c24ed25a66c7e73ae8eaa54e0.tar.gz libdbusmenu-ded5bb1e7c5bf42c24ed25a66c7e73ae8eaa54e0.tar.bz2 libdbusmenu-ded5bb1e7c5bf42c24ed25a66c7e73ae8eaa54e0.zip | |
merge trunk
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 12 | ||||
| -rw-r--r-- | tests/json-loader.c | 1 | ||||
| -rw-r--r-- | tests/test-glib-layout-client.c | 5 |
3 files changed, 13 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 9259ed1..c0081b0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,6 +2,7 @@ DBUS_RUNNER=dbus-test-runner CLEANFILES= +DISTCLEANFILES= TESTS = \ test-glib-objects-test \ @@ -264,6 +265,8 @@ test_glib_objects_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ $(DBUSMENUGLIB_LIBS) +DISTCLEANFILES += $(OBJECT_XML_REPORT) + ###################### # Test Glib Properties ###################### @@ -390,6 +393,8 @@ test_gtk_objects_LDADD = \ $(DBUSMENUGLIB_LIBS) \ $(DBUSMENUGTK_LIBS) +DISTCLEANFILES += $(GTK_OBJECT_XML_REPORT) + ###################### # Test GTK Parser ###################### @@ -418,6 +423,7 @@ test_gtk_parser_LDADD = \ $(DBUSMENUGLIB_LIBS) \ $(DBUSMENUGTK_LIBS) +DISTCLEANFILES += $(GTK_PARSER_XML_REPORT) ######################### # Test GTK Label @@ -626,8 +632,6 @@ CLEANFILES += \ distclean-local: -rm -rf $(builddir)/mago.results -DISTCLEANFILES = \ - $(filter-out %.py, $(TESTS)) \ - $(OBJECT_XML_REPORT) \ - $(GTK_OBJECT_XML_REPORT) +DISTCLEANFILES += \ + $(filter-out %.py, $(TESTS)) diff --git a/tests/json-loader.c b/tests/json-loader.c index 14e90e0..36157dc 100644 --- a/tests/json-loader.c +++ b/tests/json-loader.c @@ -109,7 +109,6 @@ set_props (DbusmenuMenuitem * mi, JsonObject * node) if (variant != NULL) { dbusmenu_menuitem_property_set_variant(mi, member, variant); - g_variant_unref(variant); } } diff --git a/tests/test-glib-layout-client.c b/tests/test-glib-layout-client.c index 5ea0cf8..3afe042 100644 --- a/tests/test-glib-layout-client.c +++ b/tests/test-glib-layout-client.c @@ -81,6 +81,11 @@ layout_updated (DbusmenuClient * client, gpointer data) g_debug("Layout Updated"); DbusmenuMenuitem * menuroot = dbusmenu_client_get_root(client); + if (menuroot == NULL) { + g_debug("Root NULL, waiting"); + return; + } + layout_t * layout = &layouts[layouton]; if (!verify_root_to_layout(menuroot, layout)) { |