From dce80730186bfb61b1919652d71fc249b8df5f75 Mon Sep 17 00:00:00 2001 From: Ted Gould 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 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 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