From dce80730186bfb61b1919652d71fc249b8df5f75 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Fri, 9 Oct 2009 12:06:56 -0400
Subject: Making the mago tests run in the make file in tests and making it so
 that they use a standard Python file.

---
 tests/Makefile.am | 45 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 6 deletions(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f111054..b93f90b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,8 @@
-SUBDIRS = dbusmenu-gtk
 
 DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
 
 TESTS = \
+	test-mago \
 	test-glib-layout \
 	test-glib-properties \
 	test-gtk-label \
@@ -35,7 +35,7 @@ glib_server_nomenu_LDADD = \
 # Test Glib Layout
 ######################
 
-test-glib-layout: test-glib-layout-client test-glib-layout-server
+test-glib-layout: test-glib-layout-client test-glib-layout-server Makefile.am
 	@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
@@ -69,7 +69,7 @@ test_glib_layout_client_LDADD = \
 # Test Glib Properties
 ######################
 
-test-glib-properties: test-glib-properties-client test-glib-properties-server
+test-glib-properties: test-glib-properties-client test-glib-properties-server Makefile.am
 	@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
@@ -117,7 +117,7 @@ test_glib_simple_items_LDADD = \
 # Test GTK Label
 #########################
 
-test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json
+test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json Makefile.am
 	@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
@@ -156,7 +156,7 @@ test_gtk_label_client_LDADD = \
 # Test GTK Reorder
 #########################
 
-test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server
+test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server Makefile.am
 	@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
@@ -176,6 +176,15 @@ test_gtk_reorder_server_LDADD = \
 	$(DBUSMENUGTK_LIBS) \
 	$(DBUSMENUTESTS_LIBS)
 
+#########################
+# Test Mago
+#########################
+
+test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/mago_tests/dbusmenu.xml Makefile.am
+	@echo "#!/bin/sh" > test-mago
+	@echo cd $(srcdir)/dbusmenu-gtk >> test-mago
+	@echo PYTHONPATH=$(srcdir)/dbusmenu-gtk/maga_tests:$(PYTHONPATH) mago -f dbusmenu.xml -t $(builddir)/mago.results >> test-mago
+	@chmod +x test-mago
 
 #########################
 # Other
@@ -188,7 +197,31 @@ examples_DATA = \
 
 EXTRA_DIST = \
 	$(examples_DATA) \
-	test-gtk-label.json
+	test-gtk-label.json \
+	dbusmenu-gtk/dbusMenuTest \
+	dbusmenu-gtk/mago_tests/data/blank_label_2levels.json \
+	dbusmenu-gtk/mago_tests/data/blank_label.json \
+	dbusmenu-gtk/mago_tests/data/blank_submenus.json \
+	dbusmenu-gtk/mago_tests/data/dynamic.json \
+	dbusmenu-gtk/mago_tests/data/long_label.json \
+	dbusmenu-gtk/mago_tests/data/no_id.json \
+	dbusmenu-gtk/mago_tests/data/no_label.json \
+	dbusmenu-gtk/mago_tests/data/sameid_submenus_diff_sizes.json \
+	dbusmenu-gtk/mago_tests/data/sameid_submenus.json \
+	dbusmenu-gtk/mago_tests/data/sameid_top_and_submenus.json \
+	dbusmenu-gtk/mago_tests/data/sameid_topmenu.json \
+	dbusmenu-gtk/mago_tests/data/several_submenus.json \
+	dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json \
+	dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json \
+	dbusmenu-gtk/mago_tests/data/static.json \
+	dbusmenu-gtk/mago_tests/data/test-gtk-label.json
+
+CLEANFILES = \
+	dbusmenu-gtk/mago_tests/dbusmenu.xml \
+	dbusmenu-gtk/mago_tests/dbusmenu.pyc
+
+distclean-local:
+	-rm -rf $(builddir)/dbusmenu-gtk/mago.results
 
 DISTCLEANFILES = \
 	$(TESTS)
-- 
cgit v1.2.3


From 7d5da2654470e74cd6eb41facc8b68a2c74289cc Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Fri, 9 Oct 2009 13:08:22 -0400
Subject: Setting up the mago paths to be absolute and correct.  Also making
 sure it has the test files that it needs.

---
 tests/Makefile.am | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b93f90b..da25f57 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -183,7 +183,9 @@ test_gtk_reorder_server_LDADD = \
 test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/mago_tests/dbusmenu.xml Makefile.am
 	@echo "#!/bin/sh" > test-mago
 	@echo cd $(srcdir)/dbusmenu-gtk >> test-mago
-	@echo PYTHONPATH=$(srcdir)/dbusmenu-gtk/maga_tests:$(PYTHONPATH) mago -f dbusmenu.xml -t $(builddir)/mago.results >> test-mago
+	@echo echo Mago Results dir: $(abs_builddir)/mago.results >> test-mago
+	@echo echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests >> test-mago
+	@echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests mago -f dbusmenu.xml -t $(abs_builddir)/mago.results --log-level=debug >> test-mago
 	@chmod +x test-mago
 
 #########################
@@ -199,6 +201,8 @@ EXTRA_DIST = \
 	$(examples_DATA) \
 	test-gtk-label.json \
 	dbusmenu-gtk/dbusMenuTest \
+	dbusmenu-gtk/mago_tests/dbusmenu.xml \
+	dbusmenu-gtk/mago_tests/dbusmenu.py \
 	dbusmenu-gtk/mago_tests/data/blank_label_2levels.json \
 	dbusmenu-gtk/mago_tests/data/blank_label.json \
 	dbusmenu-gtk/mago_tests/data/blank_submenus.json \
-- 
cgit v1.2.3


From 462d25ae76f833ca7ac977406045833bb29fbbb4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Sat, 10 Oct 2009 15:40:47 -0400
Subject: Getting the build directly through to the script.

---
 tests/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index da25f57..10fe857 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -185,6 +185,7 @@ test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/ma
 	@echo cd $(srcdir)/dbusmenu-gtk >> test-mago
 	@echo echo Mago Results dir: $(abs_builddir)/mago.results >> test-mago
 	@echo echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests >> test-mago
+	@echo export INDICATOR_BUILD_DIR=$(abs_builddir) >> test-mago
 	@echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests mago -f dbusmenu.xml -t $(abs_builddir)/mago.results --log-level=debug >> test-mago
 	@chmod +x test-mago
 
-- 
cgit v1.2.3


From bba2d0aecb9ac87a822f343cad0f55002ed96dd6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Sat, 10 Oct 2009 16:43:33 -0400
Subject: Adding in basic xvfb stuff, doesn't quite work.

---
 tests/Makefile.am | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 10fe857..833c3fc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,6 @@
 DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
 
 TESTS = \
-	test-mago \
 	test-glib-layout \
 	test-glib-properties \
 	test-gtk-label \
@@ -20,6 +19,33 @@ check_PROGRAMS = \
 	test-glib-simple-items \
 	test-gtk-reorder-server
 
+check-local: test-mago-xvfb
+
+######################
+# Xvfb server stuff
+######################
+
+XVFB = Xvfb -ac -noreset -screen 0 800x600x16
+XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
+   491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
+   991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
+  1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
+  9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
+  9995 9996 9997 9998 9999
+XVFB_START = \
+	${XVFB} -help 2>/dev/null 1>&2 \
+	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
+	&& { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
+	       trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
+	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+	&& DISPLAY=:$$XID && export DISPLAY
+# call as: $(XVFB_START) && someprogram
+
+
+######################
+# Test GLib server
+######################
+
 glib_server_nomenu_SOURCES = \
 	glib-server-nomenu.c
 
@@ -180,6 +206,9 @@ test_gtk_reorder_server_LDADD = \
 # Test Mago
 #########################
 
+test-mago-xvfb: test-mago
+	$(XVFB_START) && ./test-mago
+
 test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/mago_tests/dbusmenu.xml Makefile.am
 	@echo "#!/bin/sh" > test-mago
 	@echo cd $(srcdir)/dbusmenu-gtk >> test-mago
-- 
cgit v1.2.3


From 4e98b4e5469f082b7bee2bad37533056ded73d9f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Wed, 18 Nov 2009 15:39:05 -0600
Subject: Starting up the AT-SPI regististry service

---
 tests/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 833c3fc..9d17a03 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -212,6 +212,7 @@ test-mago-xvfb: test-mago
 test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/mago_tests/dbusmenu.xml Makefile.am
 	@echo "#!/bin/sh" > test-mago
 	@echo cd $(srcdir)/dbusmenu-gtk >> test-mago
+	@echo /usr/lib/at-spi/at-spi-registryd & >> test-mago
 	@echo echo Mago Results dir: $(abs_builddir)/mago.results >> test-mago
 	@echo echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests >> test-mago
 	@echo export INDICATOR_BUILD_DIR=$(abs_builddir) >> test-mago
-- 
cgit v1.2.3


From 4cdbbb71476d5f3b6979f6cd43acf3b1ea1f1004 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 19 Nov 2009 17:01:38 -0600
Subject: Trying to do the xvfb stuff as a shell script to get included. 
 Simpler, and works with autotest.

---
 tests/Makefile.am | 48 ++++++++++++++----------------------------------
 1 file changed, 14 insertions(+), 34 deletions(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9d17a03..3443073 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,8 +4,11 @@ DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.c
 TESTS = \
 	test-glib-layout \
 	test-glib-properties \
-	test-gtk-label \
 	test-glib-simple-items \
+	test-mago
+
+GTK_TESTS = \
+	test-gtk-label \
 	test-gtk-reorder
 
 check_PROGRAMS = \
@@ -19,28 +22,7 @@ check_PROGRAMS = \
 	test-glib-simple-items \
 	test-gtk-reorder-server
 
-check-local: test-mago-xvfb
-
-######################
-# Xvfb server stuff
-######################
-
-XVFB = Xvfb -ac -noreset -screen 0 800x600x16
-XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
-   491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
-   991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
-  1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
-  9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
-  9995 9996 9997 9998 9999
-XVFB_START = \
-	${XVFB} -help 2>/dev/null 1>&2 \
-	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
-	&& { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
-	       trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
-	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
-	&& DISPLAY=:$$XID && export DISPLAY
-# call as: $(XVFB_START) && someprogram
-
+XVFB_RUN=". run-xvfb.sh"
 
 ######################
 # Test GLib server
@@ -206,18 +188,16 @@ test_gtk_reorder_server_LDADD = \
 # Test Mago
 #########################
 
-test-mago-xvfb: test-mago
-	$(XVFB_START) && ./test-mago
-
 test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/mago_tests/dbusmenu.xml Makefile.am
-	@echo "#!/bin/sh" > test-mago
-	@echo cd $(srcdir)/dbusmenu-gtk >> test-mago
-	@echo /usr/lib/at-spi/at-spi-registryd & >> test-mago
-	@echo echo Mago Results dir: $(abs_builddir)/mago.results >> test-mago
-	@echo echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests >> test-mago
-	@echo export INDICATOR_BUILD_DIR=$(abs_builddir) >> test-mago
-	@echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests mago -f dbusmenu.xml -t $(abs_builddir)/mago.results --log-level=debug >> test-mago
-	@chmod +x test-mago
+	@echo "#!/bin/sh" > $@
+	@echo $(XVFB_RUN) >> $@
+	@echo cd $(srcdir)/dbusmenu-gtk >> $@
+	@echo /usr/lib/at-spi/at-spi-registryd \& >> $@
+	@echo echo Mago Results dir: $(abs_builddir)/mago.results >> $@
+	@echo echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests >> $@
+	@echo export INDICATOR_BUILD_DIR=$(abs_builddir) >> $@
+	@echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests mago -f dbusmenu.xml -t $(abs_builddir)/mago.results --log-level=debug >> $@
+	@chmod +x $@
 
 #########################
 # Other
-- 
cgit v1.2.3


From d8427db9d5559e49bbec99f0bd01aaeafa82b347 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 19 Nov 2009 17:21:55 -0600
Subject: Switching to Bash

---
 tests/Makefile.am | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3443073..8523b06 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,7 +44,7 @@ glib_server_nomenu_LDADD = \
 ######################
 
 test-glib-layout: test-glib-layout-client test-glib-layout-server Makefile.am
-	@echo "#!/bin/sh" > test-glib-layout
+	@echo "#!/bin/bash" > 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
 
@@ -78,7 +78,7 @@ test_glib_layout_client_LDADD = \
 ######################
 
 test-glib-properties: test-glib-properties-client test-glib-properties-server Makefile.am
-	@echo "#!/bin/sh" > test-glib-properties
+	@echo "#!/bin/bash" > 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
 
@@ -126,7 +126,7 @@ test_glib_simple_items_LDADD = \
 #########################
 
 test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json Makefile.am
-	@echo "#!/bin/sh" > test-gtk-label
+	@echo "#!/bin/bash" > 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
 
@@ -165,7 +165,7 @@ test_gtk_label_client_LDADD = \
 #########################
 
 test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server Makefile.am
-	@echo "#!/bin/sh" > test-gtk-reorder
+	@echo "#!/bin/bash" > 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
 
@@ -189,7 +189,7 @@ test_gtk_reorder_server_LDADD = \
 #########################
 
 test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/mago_tests/dbusmenu.xml Makefile.am
-	@echo "#!/bin/sh" > $@
+	@echo "#!/bin/bash" > $@
 	@echo $(XVFB_RUN) >> $@
 	@echo cd $(srcdir)/dbusmenu-gtk >> $@
 	@echo /usr/lib/at-spi/at-spi-registryd \& >> $@
-- 
cgit v1.2.3


From 488550df2ebafd6e25b90b4818345fed1034395e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 19 Nov 2009 17:26:04 -0600
Subject: Making the gtk tests use the Xvfb stuff

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

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8523b06..00f4e53 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,11 +5,9 @@ TESTS = \
 	test-glib-layout \
 	test-glib-properties \
 	test-glib-simple-items \
-	test-mago
-
-GTK_TESTS = \
 	test-gtk-label \
-	test-gtk-reorder
+	test-gtk-reorder \
+	test-mago
 
 check_PROGRAMS = \
 	glib-server-nomenu \
@@ -127,6 +125,7 @@ test_glib_simple_items_LDADD = \
 
 test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json Makefile.am
 	@echo "#!/bin/bash" > test-gtk-label
+	@echo $(XVFB_RUN) >> $@
 	@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
 
@@ -166,6 +165,7 @@ test_gtk_label_client_LDADD = \
 
 test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server Makefile.am
 	@echo "#!/bin/bash" > test-gtk-reorder
+	@echo $(XVFB_RUN) >> $@
 	@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
 
-- 
cgit v1.2.3


From 92e979dd45cdf2fd074d0ec79bcd44bd4e9bcd22 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 19 Nov 2009 17:31:14 -0600
Subject: Make sure to ship 'run-xvfb.sh' for testing.

---
 tests/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 00f4e53..f35eb07 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -210,6 +210,7 @@ examples_DATA = \
 
 EXTRA_DIST = \
 	$(examples_DATA) \
+	run-xvfb.sh \
 	test-gtk-label.json \
 	dbusmenu-gtk/dbusMenuTest \
 	dbusmenu-gtk/mago_tests/dbusmenu.xml \
-- 
cgit v1.2.3


From 050b5bfaf2c3d60af856f2e3e43e0dbdd9d9fb73 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 19 Nov 2009 17:36:45 -0600
Subject: Make sure to grab the xvfb script from the src dir for distcheck.

---
 tests/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f35eb07..d859b3c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,7 +20,7 @@ check_PROGRAMS = \
 	test-glib-simple-items \
 	test-gtk-reorder-server
 
-XVFB_RUN=". run-xvfb.sh"
+XVFB_RUN=". $(srcdir)/run-xvfb.sh"
 
 ######################
 # Test GLib server
-- 
cgit v1.2.3


From a7829bcde6716b75543b83f04f45533320d6c544 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 19 Nov 2009 17:51:37 -0600
Subject: Don't delete the file we need!

---
 tests/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d859b3c..ae929de 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -233,7 +233,6 @@ EXTRA_DIST = \
 	dbusmenu-gtk/mago_tests/data/test-gtk-label.json
 
 CLEANFILES = \
-	dbusmenu-gtk/mago_tests/dbusmenu.xml \
 	dbusmenu-gtk/mago_tests/dbusmenu.pyc
 
 distclean-local:
-- 
cgit v1.2.3


From 51d8c007973e5b55a0d188c1d53cbf2883100726 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 19 Nov 2009 18:04:15 -0600
Subject: Adding in some @ work.  It's better.

---
 tests/Makefile.am | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ae929de..1ec3b19 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -42,9 +42,9 @@ glib_server_nomenu_LDADD = \
 ######################
 
 test-glib-layout: test-glib-layout-client test-glib-layout-server Makefile.am
-	@echo "#!/bin/bash" > 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
+	@echo "#!/bin/bash" > $@
+	@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 = \
 	test-glib-layout.h \
@@ -76,9 +76,9 @@ test_glib_layout_client_LDADD = \
 ######################
 
 test-glib-properties: test-glib-properties-client test-glib-properties-server Makefile.am
-	@echo "#!/bin/bash" > 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
+	@echo "#!/bin/bash" > $@
+	@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 = \
 	test-glib-properties.h \
@@ -124,10 +124,10 @@ test_glib_simple_items_LDADD = \
 #########################
 
 test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json Makefile.am
-	@echo "#!/bin/bash" > test-gtk-label
+	@echo "#!/bin/bash" > $@
 	@echo $(XVFB_RUN) >> $@
-	@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
+	@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 = \
 	test-gtk-label-server.c
@@ -164,10 +164,10 @@ test_gtk_label_client_LDADD = \
 #########################
 
 test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server Makefile.am
-	@echo "#!/bin/bash" > test-gtk-reorder
+	@echo "#!/bin/bash" > $@
 	@echo $(XVFB_RUN) >> $@
-	@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
+	@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 = \
 	test-gtk-reorder-server.c
-- 
cgit v1.2.3


From 2da6e05ab3bea81f6e589f7ed9e2d9c9546e65c8 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 19 Nov 2009 19:20:51 -0600
Subject: Deleting the right results.

---
 tests/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1ec3b19..f54aa6b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -236,7 +236,7 @@ CLEANFILES = \
 	dbusmenu-gtk/mago_tests/dbusmenu.pyc
 
 distclean-local:
-	-rm -rf $(builddir)/dbusmenu-gtk/mago.results
+	-rm -rf $(builddir)/mago.results
 
 DISTCLEANFILES = \
 	$(TESTS)
-- 
cgit v1.2.3


From d69a3dcc879f3dc15d806f856877bfff16e59f1b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 8 Dec 2009 09:46:16 -0600
Subject: Disabling the mago tests as they always pass and they take a while to
 run.

---
 tests/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f54aa6b..fa85d7f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,8 +6,7 @@ TESTS = \
 	test-glib-properties \
 	test-glib-simple-items \
 	test-gtk-label \
-	test-gtk-reorder \
-	test-mago
+	test-gtk-reorder
 
 check_PROGRAMS = \
 	glib-server-nomenu \
-- 
cgit v1.2.3