ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #00514
[Branch ~dbusmenu-team/dbusmenu/trunk] Rev 30: Merging in the updates to make mago work nicely.
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/dbusmenu/test_update/+merge/13174
proposed by: Ted Gould (ted)
review: Approve - Cody Russell (bratsche)
------------------------------------------------------------
revno: 30 [merge]
committer: Ted Gould <ted@xxxxxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2009-10-11 12:31:22 -0400
message:
Merging in the updates to make mago work nicely.
removed:
tests/dbusmenu-gtk/Makefile.am
renamed:
tests/dbusmenu-gtk/dbusmenu.py.in => tests/dbusmenu-gtk/mago_tests/dbusmenu.py
tests/dbusmenu-gtk/dbusmenu.xml.in => tests/dbusmenu-gtk/mago_tests/dbusmenu.xml
modified:
.bzrignore
configure.ac
tests/Makefile.am
tests/dbusmenu-gtk/dbusMenuTest
tests/dbusmenu-gtk/mago_tests/dbusmenu.py
tests/dbusmenu-gtk/mago_tests/dbusmenu.xml
--
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 '.bzrignore'
--- .bzrignore 2009-10-06 17:01:48 +0000
+++ .bzrignore 2009-10-09 16:06:56 +0000
@@ -51,3 +51,4 @@
tools/dbusmenu-dumper
libdbusmenu-[0-9].[0-9].[0-9].tar.gz
libdbusmenu-[0-9].[0-9].[0-9].tar.gz.asc
+tests/test-mago
=== modified file 'configure.ac'
--- configure.ac 2009-10-06 17:01:48 +0000
+++ configure.ac 2009-10-09 16:06:56 +0000
@@ -108,7 +108,6 @@
libdbusmenu-qt/dbusmenu-qt.pc
tools/Makefile
tests/Makefile
-tests/dbusmenu-gtk/Makefile
])
###########################
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am 2009-10-02 21:50:56 +0000
+++ tests/Makefile.am 2009-10-10 19:40:47 +0000
@@ -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 @@
# 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 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 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 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,18 @@
$(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 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
#########################
# Other
@@ -188,7 +200,33 @@
EXTRA_DIST = \
$(examples_DATA) \
- test-gtk-label.json
+ 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 \
+ 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)
=== removed file 'tests/dbusmenu-gtk/Makefile.am'
--- tests/dbusmenu-gtk/Makefile.am 2009-10-07 10:55:40 +0000
+++ tests/dbusmenu-gtk/Makefile.am 1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-
-check: tests
-
-tests: mago
-
-mago: dbusmenu.xml dbusmenu.py
- PYTHONPATH=$(builddir) mago -f dbusmenu.xml -t $(builddir)/mago.results
-
-dbusmenu.xml: dbusmenu.xml.in
- sed -e "s|\@srcdir\@|$(srcdir)|" $< > mago_tests/$@
-
-dbusmenu.py: dbusmenu.py.in
- sed -e "s|\@srcdir\@|$(srcdir)|" $< > mago_tests/$@
-
-EXTRA_DIST = \
- dbusmenu.xml.in \
- dbusmenu.py.in \
- dbusMenuTest \
- mago_tests/data/blank_label_2levels.json \
- mago_tests/data/blank_label.json \
- mago_tests/data/blank_submenus.json \
- mago_tests/data/dynamic.json \
- mago_tests/data/long_label.json \
- mago_tests/data/no_id.json \
- mago_tests/data/no_label.json \
- mago_tests/data/sameid_submenus_diff_sizes.json \
- mago_tests/data/sameid_submenus.json \
- mago_tests/data/sameid_top_and_submenus.json \
- mago_tests/data/sameid_topmenu.json \
- mago_tests/data/several_submenus.json \
- mago_tests/data/several_submenus_recursive.json \
- mago_tests/data/several_submenus_utf8.json \
- mago_tests/data/static.json \
- mago_tests/data/test-gtk-label.json
-
-CLEANFILES = \
- mago_tests/dbusmenu.xml \
- mago_tests/dbusmenu.pyc \
- mago_tests/dbusmenu.py
-
-distclean-local:
- -rm -rf $(builddir)/mago.results
-
=== modified file 'tests/dbusmenu-gtk/dbusMenuTest'
--- tests/dbusmenu-gtk/dbusMenuTest 2009-10-07 10:55:40 +0000
+++ tests/dbusmenu-gtk/dbusMenuTest 2009-10-10 19:40:47 +0000
@@ -3,6 +3,6 @@
export NO_GAIL=0
export NO_AT_BRIDGE=0
-dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf --task ../test-gtk-label-client --task-name Client --task ../test-gtk-label-server --parameter ./mago_tests/$1 --task-name Server --ignore-return
+dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf --task $INDICATOR_BUILD_DIR/test-gtk-label-client --task-name Client --task $INDICATOR_BUILD_DIR/test-gtk-label-server --parameter ./mago_tests/$1 --task-name Server --ignore-return
=== renamed file 'tests/dbusmenu-gtk/dbusmenu.py.in' => 'tests/dbusmenu-gtk/mago_tests/dbusmenu.py'
--- tests/dbusmenu-gtk/dbusmenu.py.in 2009-06-25 14:13:27 +0000
+++ tests/dbusmenu-gtk/mago_tests/dbusmenu.py 2009-10-09 16:06:56 +0000
@@ -1,10 +1,10 @@
from mago.test_suite.main import SingleApplicationTestSuite
from mago.application.main import Application
-import ldtp, ooldtp, ldtputils
+import ldtp, ooldtp, ldtputils, os.path
class DbusMenuGtkApp():
- LAUNCHER = "@srcdir@/dbusMenuTest"
+ LAUNCHER = os.path.join(os.path.dirname(__file__), "..", "dbusMenuTest")
WINDOW = "frmlibdbusmenu-gtktest"
def open(self, menu_schema=''):
=== renamed file 'tests/dbusmenu-gtk/dbusmenu.xml.in' => 'tests/dbusmenu-gtk/mago_tests/dbusmenu.xml'
--- tests/dbusmenu-gtk/dbusmenu.xml.in 2009-06-24 17:47:16 +0000
+++ tests/dbusmenu-gtk/mago_tests/dbusmenu.xml 2009-10-09 16:06:56 +0000
@@ -8,7 +8,7 @@
<method>testStaticMenu</method>
<description>Simple check for a menu </description>
<args>
- <menu_schema>@srcdir@/data/static.json</menu_schema>
+ <menu_schema>data/static.json</menu_schema>
<menu_item>value39</menu_item>
</args>
</case>
@@ -16,7 +16,7 @@
<method>testStaticMenu</method>
<description>Blank Label</description>
<args>
- <menu_schema>@srcdir@/data/blank_label.json</menu_schema>
+ <menu_schema>data/blank_label.json</menu_schema>
<menu_item></menu_item>
</args>
</case>
@@ -24,7 +24,7 @@
<method>testSubmenus</method>
<description>Blank Submenus</description>
<args>
- <menu_schema>@srcdir@/data/blank_submenus.json</menu_schema>
+ <menu_schema>data/blank_submenus.json</menu_schema>
<menu_item>value6</menu_item>
<submenus></submenus>
</args>
@@ -33,7 +33,7 @@
<method>testStaticMenu</method>
<description>Really Long Label (1000 chars)</description>
<args>
- <menu_schema>@srcdir@/data/long_label.json</menu_schema>
+ <menu_schema>data/long_label.json</menu_schema>
<menu_item>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</menu_item>
</args>
</case>
@@ -41,7 +41,7 @@
<method>testStaticMenu</method>
<description>Search for a submenu that comes from a menu without ID</description>
<args>
- <menu_schema>@srcdir@/data/no_id.json</menu_schema>
+ <menu_schema>data/no_id.json</menu_schema>
<menu_item>submenu_from_no_id</menu_item>
</args>
</case>
@@ -49,7 +49,7 @@
<method>testStaticMenu</method>
<description>Search for a submenu that comes from a menu with a blank label</description>
<args>
- <menu_schema>@srcdir@/data/blank_label_2levels.json</menu_schema>
+ <menu_schema>data/blank_label_2levels.json</menu_schema>
<menu_item>value10</menu_item>
</args>
</case>
@@ -57,7 +57,7 @@
<method>testStaticMenu</method>
<description>Be sure that a submenu from a menu without label does not exist</description>
<args>
- <menu_schema>@srcdir@/data/no_label.json</menu_schema>
+ <menu_schema>data/no_label.json</menu_schema>
<menu_item>submenu_from_no_label</menu_item>
<notexists>True</notexists>
</args>
@@ -66,7 +66,7 @@
<method>testStaticMenu</method>
<description>Check that a submenu is shown</description>
<args>
- <menu_schema>@srcdir@/data/several_submenus.json</menu_schema>
+ <menu_schema>data/several_submenus.json</menu_schema>
<menu_item>value10</menu_item>
</args>
</case>
@@ -74,7 +74,7 @@
<method>testStaticMenu</method>
<description>Be sure that a submenu from a 4th level depth, is shown</description>
<args>
- <menu_schema>@srcdir@/data/several_submenus_recursive.json</menu_schema>
+ <menu_schema>data/several_submenus_recursive.json</menu_schema>
<menu_item>value7001</menu_item>
</args>
</case>
@@ -82,7 +82,7 @@
<method>testStaticMenu</method>
<description>Be sure that a submenu, with a UTF-8 label, is shown</description>
<args>
- <menu_schema>@srcdir@/data/several_submenus_utf8.json</menu_schema>
+ <menu_schema>data/several_submenus_utf8.json</menu_schema>
<menu_item>value5ã¹</menu_item>
</args>
</case>