------------------------------------------------------------ revno: 43 committer: Ted Gould <[email protected]> branch nick: trunk timestamp: Tue 2009-12-22 20:51:37 -0600 message: Removing the bustle captures as we're not using them and they seem to be breaking on Hudson. modified: tests/Makefile.am tests/test-glib-layout-client.c tests/test-glib-objects.c tests/test-glib-properties-client.c
-- lp:dbusmenu https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk Your team ayatana-commits is subscribed to branch lp:dbusmenu. To unsubscribe from this branch go to https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk/+edit-subscription.
=== modified file 'tests/Makefile.am' --- tests/Makefile.am 2009-12-21 20:56:49 +0000 +++ tests/Makefile.am 2009-12-23 02:51:37 +0000 @@ -44,7 +44,7 @@ test-glib-layout: test-glib-layout-client test-glib-layout-server Makefile.am @echo "#!/bin/bash" > $@ - @echo $(DBUS_RUNNER) -b [email protected] --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> $@ + @echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> $@ @chmod +x $@ test_glib_layout_server_SOURCES = \ @@ -80,7 +80,7 @@ test-glib-objects-test: test-glib-objects Makefile.am @echo "#!/bin/bash" > $@ - @echo $(DBUS_RUNNER) -b [email protected] --task gtester --parameter -k --parameter -o --parameter $(OBJECT_XML_REPORT) --parameter ./test-glib-objects >> $@ + @echo $(DBUS_RUNNER) --task gtester --parameter --verbose --parameter -k --parameter -o --parameter $(OBJECT_XML_REPORT) --parameter ./test-glib-objects >> $@ @chmod +x $@ test_glib_objects_SOURCES = \ @@ -100,7 +100,7 @@ test-glib-properties: test-glib-properties-client test-glib-properties-server Makefile.am @echo "#!/bin/bash" > $@ - @echo $(DBUS_RUNNER) -b [email protected] --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> $@ + @echo $(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> $@ @chmod +x $@ test_glib_properties_server_SOURCES = \ @@ -149,7 +149,7 @@ test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json Makefile.am @echo "#!/bin/bash" > $@ @echo $(XVFB_RUN) >> $@ - @echo $(DBUS_RUNNER) -b [email protected] --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@ + @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@ @chmod +x $@ test_gtk_label_server_SOURCES = \ @@ -189,7 +189,7 @@ test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server Makefile.am @echo "#!/bin/bash" > $@ @echo $(XVFB_RUN) >> $@ - @echo $(DBUS_RUNNER) -b [email protected] --task ./test-gtk-label-client --task-name Client --task ./test-gtk-reorder-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@ + @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-reorder-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@ @chmod +x $@ test_gtk_reorder_server_SOURCES = \ @@ -263,10 +263,5 @@ DISTCLEANFILES = \ $(TESTS) \ - $(OBJECT_XML_FILE) \ - test-glib-objects-test.bustle \ - test-glib-layout.bustle \ - test-glib-properties.bustle \ - test-glib-simple-items.bustle \ - test-gtk-label.bustle \ - test-gtk-reorder.bustle + $(OBJECT_XML_FILE) + === modified file 'tests/test-glib-layout-client.c' --- tests/test-glib-layout-client.c 2009-12-17 22:41:01 +0000 +++ tests/test-glib-layout-client.c 2009-12-23 02:51:37 +0000 @@ -111,7 +111,7 @@ g_usleep(500000); - DbusmenuClient * client = dbusmenu_client_new(":1.1", "/org/test"); + DbusmenuClient * client = dbusmenu_client_new(":1.0", "/org/test"); g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL); g_timeout_add_seconds(10, timer_func, client); === modified file 'tests/test-glib-objects.c' --- tests/test-glib-objects.c 2009-12-21 22:54:48 +0000 +++ tests/test-glib-objects.c 2009-12-23 02:51:37 +0000 @@ -155,9 +155,10 @@ static void test_object_menuitem_props_signals_helper (DbusmenuMenuitem * mi, gchar * property, GValue * value, GValue ** out) { - /* g_debug("Signal handler got: %s", property); */ if (!g_strcmp0(property, "swapper")) { *out = value; + } else { + g_warning("Signal handler got: %s", property); } return; } === modified file 'tests/test-glib-properties-client.c' --- tests/test-glib-properties-client.c 2009-12-17 22:41:01 +0000 +++ tests/test-glib-properties-client.c 2009-12-23 02:51:37 +0000 @@ -155,7 +155,7 @@ /* Make sure the server starts up and all that */ g_usleep(500000); - DbusmenuClient * client = dbusmenu_client_new(":1.1", "/org/test"); + DbusmenuClient * client = dbusmenu_client_new(":1.0", "/org/test"); g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL); death_timer = g_timeout_add_seconds(10, timer_func, client);
_______________________________________________ Mailing list: https://launchpad.net/~ayatana-commits Post to : [email protected] Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
