ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ara Pulido (apulido)
------------------------------------------------------------
revno: 29 [merge]
author: Ara Pulido <ara.pulido@xxxxxxxxxxxxx>
committer: Ted Gould <ted@xxxxxxxxxxxxx>
branch nick: trunk
timestamp: Wed 2009-10-07 23:11:30 -0400
message:
  Patch to update the Mago tests to the new Mago
added:
  tests/dbusmenu-gtk/mago_tests/
renamed:
  tests/dbusmenu-gtk/data/ => tests/dbusmenu-gtk/mago_tests/data/
modified:
  tests/dbusmenu-gtk/Makefile.am
  tests/dbusmenu-gtk/dbusMenuTest


--
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/dbusmenu-gtk/Makefile.am'
--- tests/dbusmenu-gtk/Makefile.am	2009-06-25 15:40:26 +0000
+++ tests/dbusmenu-gtk/Makefile.am	2009-10-07 10:55:40 +0000
@@ -4,39 +4,39 @@
 tests: mago
 
 mago: dbusmenu.xml dbusmenu.py
-	PYTHONPATH=$(builddir) mago -f $(builddir)/dbusmenu.xml -t $(builddir)/mago.results
+	PYTHONPATH=$(builddir) mago -f dbusmenu.xml -t $(builddir)/mago.results
 
 dbusmenu.xml: dbusmenu.xml.in
-	sed -e "s|\@srcdir\@|$(srcdir)|" $< > $@
+	sed -e "s|\@srcdir\@|$(srcdir)|" $< > mago_tests/$@
 
 dbusmenu.py: dbusmenu.py.in
-	sed -e "s|\@srcdir\@|$(srcdir)|" $< > $@
+	sed -e "s|\@srcdir\@|$(srcdir)|" $< > mago_tests/$@
 
 EXTRA_DIST = \
 	dbusmenu.xml.in \
 	dbusmenu.py.in \
 	dbusMenuTest \
-	data/blank_label_2levels.json \
-	data/blank_label.json \
-	data/blank_submenus.json \
-	data/dynamic.json \
-	data/long_label.json \
-	data/no_id.json \
-	data/no_label.json \
-	data/sameid_submenus_diff_sizes.json \
-	data/sameid_submenus.json \
-	data/sameid_top_and_submenus.json \
-	data/sameid_topmenu.json \
-	data/several_submenus.json \
-	data/several_submenus_recursive.json \
-	data/several_submenus_utf8.json \
-	data/static.json \
-	data/test-gtk-label.json
+	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 = \
-	dbusmenu.xml \
-	dbusmenu.pyc \
-	dbusmenu.py
+	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-06-25 09:04:54 +0000
+++ tests/dbusmenu-gtk/dbusMenuTest	2009-10-07 10:55:40 +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 ./$1 --task-name Server --ignore-return
+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
 
 

=== added directory 'tests/dbusmenu-gtk/mago_tests'
=== renamed directory 'tests/dbusmenu-gtk/data' => 'tests/dbusmenu-gtk/mago_tests/data'