From ef964f38b92cc6151549fd5e7aed33776cdb567d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Wed, 30 Sep 2009 15:02:59 -0500
Subject: Cleaning up the tests so that they run and check their values in a
 friendly way.

---
 tests/Makefile.am | 38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8c47a93..e96098f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,12 +1,14 @@
 SUBDIRS = dbusmenu-gtk
 
-check: tests
-
 DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
 
-tests: test-glib-layout test-glib-properties test-gtk-label test-glib-simple-items
+TESTS = \
+	test-glib-layout \
+	test-glib-properties \
+	test-gtk-label \
+	test-glib-simple-items
 
-libexec_PROGRAMS = \
+check_PROGRAMS = \
 	glib-server-nomenu \
 	test-glib-layout-client \
 	test-glib-layout-server \
@@ -27,10 +29,14 @@ glib_server_nomenu_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
 	$(DBUSMENUGLIB_LIBS)
 
-
+######################
+# Test Glib Layout
+######################
 
 test-glib-layout: test-glib-layout-client test-glib-layout-server
-	$(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return
+	@echo "#!/bin/sh" > test-glib-layout
+	@echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> test-glib-layout
+	@chmod +x test-glib-layout
 
 test_glib_layout_server_SOURCES = \
 	test-glib-layout.h \
@@ -57,9 +63,14 @@ test_glib_layout_client_LDADD = \
 	$(DBUSMENUGLIB_LIBS)
 
 
+######################
+# Test Glib Properties
+######################
 
 test-glib-properties: test-glib-properties-client test-glib-properties-server
-	$(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return
+	@echo "#!/bin/sh" > test-glib-properties
+	@echo $(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> test-glib-properties
+	@chmod +x test-glib-properties
 
 test_glib_properties_server_SOURCES = \
 	test-glib-properties.h \
@@ -85,6 +96,9 @@ test_glib_properties_client_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
 	$(DBUSMENUGLIB_LIBS)
 
+#########################
+# Test Glib Simple Items
+#########################
 
 test_glib_simple_items_SOURCES = \
 	test-glib-simple-items.c
@@ -97,9 +111,14 @@ test_glib_simple_items_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
 	$(DBUSMENUGLIB_LIBS)
 
+#########################
+# Test GTK Label
+#########################
 
 test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json
-	$(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
+	@echo "#!/bin/sh" > test-gtk-label
+	@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 >> test-gtk-label
+	@chmod +x test-gtk-label
 
 test_gtk_label_server_SOURCES = \
 	test-gtk-label-server.c
@@ -132,6 +151,9 @@ test_gtk_label_client_LDADD = \
 	$(DBUSMENUTESTS_LIBS)
 
 
+#########################
+# Other
+#########################
 
 examplesdir = $(docdir)/examples/
 
-- 
cgit v1.2.3


From ad7737b4cec428bc1f97b1f2223e7b83be67f1e6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Wed, 30 Sep 2009 15:52:42 -0500
Subject: Building a test for reordering.

---
 tests/Makefile.am | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e96098f..ace4bf4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,7 +6,8 @@ TESTS = \
 	test-glib-layout \
 	test-glib-properties \
 	test-gtk-label \
-	test-glib-simple-items
+	test-glib-simple-items \
+	test-gtk-reorder
 
 check_PROGRAMS = \
 	glib-server-nomenu \
@@ -16,7 +17,8 @@ check_PROGRAMS = \
 	test-glib-properties-server \
 	test-gtk-label-client \
 	test-gtk-label-server \
-	test-glib-simple-items
+	test-glib-simple-items \
+	test-gtk-reorder-server
 
 glib_server_nomenu_SOURCES = \
 	glib-server-nomenu.c
@@ -150,6 +152,30 @@ test_gtk_label_client_LDADD = \
 	$(DBUSMENUGTK_LIBS) \
 	$(DBUSMENUTESTS_LIBS)
 
+#########################
+# Test GTK Reorder
+#########################
+
+test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server
+	@echo "#!/bin/sh" > test-gtk-reorder
+	@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 >> test-gtk-reorder
+	@chmod +x test-gtk-reorder
+
+test_gtk_reorder_server_SOURCES = \
+	test-gtk-reorder-server.c
+
+test_gtk_reorder_server_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGTK_CFLAGS) \
+	$(DBUSMENUTESTS_CFLAGS) \
+	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_gtk_reorder_server_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	../libdbusmenu-gtk/libdbusmenu-gtk.la \
+	$(DBUSMENUGTK_LIBS) \
+	$(DBUSMENUTESTS_LIBS)
+
 
 #########################
 # Other
-- 
cgit v1.2.3