aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAra Pulido <ara.pulido@canonical.com>2009-10-07 23:11:30 -0400
committerTed Gould <ted@canonical.com>2009-10-07 23:11:30 -0400
commit1e668b013089c5a4027102bca75f7542917fef2d (patch)
tree96b353516a5934b58490fc2eb3ded5a2854c0141
parent017f95870a0b26cd87a1c107076478040340340d (diff)
parenta2c6731fc3298db13c700dbaec978af4c8eafe28 (diff)
downloadlibdbusmenu-1e668b013089c5a4027102bca75f7542917fef2d.tar.gz
libdbusmenu-1e668b013089c5a4027102bca75f7542917fef2d.tar.bz2
libdbusmenu-1e668b013089c5a4027102bca75f7542917fef2d.zip
Patch to update the Mago tests to the new Mago
-rw-r--r--tests/dbusmenu-gtk/Makefile.am44
-rwxr-xr-xtests/dbusmenu-gtk/dbusMenuTest2
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/blank_label.json (renamed from tests/dbusmenu-gtk/data/blank_label.json)0
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/blank_label_2levels.json (renamed from tests/dbusmenu-gtk/data/blank_label_2levels.json)0
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/blank_submenus.json (renamed from tests/dbusmenu-gtk/data/blank_submenus.json)0
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/dynamic.json (renamed from tests/dbusmenu-gtk/data/dynamic.json)0
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/long_label.json (renamed from tests/dbusmenu-gtk/data/long_label.json)0
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/no_id.json (renamed from tests/dbusmenu-gtk/data/no_id.json)0
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/no_label.json (renamed from tests/dbusmenu-gtk/data/no_label.json)0
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/sameid_submenus.json (renamed from tests/dbusmenu-gtk/data/sameid_submenus.json)0
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/sameid_submenus_diff_sizes.json (renamed from tests/dbusmenu-gtk/data/sameid_submenus_diff_sizes.json)0
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/sameid_top_and_submenus.json (renamed from tests/dbusmenu-gtk/data/sameid_top_and_submenus.json)0
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/sameid_topmenu.json (renamed from tests/dbusmenu-gtk/data/sameid_topmenu.json)0
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/several_submenus.json (renamed from tests/dbusmenu-gtk/data/several_submenus.json)0
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json (renamed from tests/dbusmenu-gtk/data/several_submenus_recursive.json)0
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json (renamed from tests/dbusmenu-gtk/data/several_submenus_utf8.json)0
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/static.json (renamed from tests/dbusmenu-gtk/data/static.json)0
-rw-r--r--tests/dbusmenu-gtk/mago_tests/data/test-gtk-label.json (renamed from tests/dbusmenu-gtk/data/test-gtk-label.json)0
18 files changed, 23 insertions, 23 deletions
diff --git a/tests/dbusmenu-gtk/Makefile.am b/tests/dbusmenu-gtk/Makefile.am
index 6acbbe0..7fdd6d9 100644
--- a/tests/dbusmenu-gtk/Makefile.am
+++ b/tests/dbusmenu-gtk/Makefile.am
@@ -4,39 +4,39 @@ check: tests
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
diff --git a/tests/dbusmenu-gtk/dbusMenuTest b/tests/dbusmenu-gtk/dbusMenuTest
index 46c5f67..0815a79 100755
--- a/tests/dbusmenu-gtk/dbusMenuTest
+++ b/tests/dbusmenu-gtk/dbusMenuTest
@@ -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
diff --git a/tests/dbusmenu-gtk/data/blank_label.json b/tests/dbusmenu-gtk/mago_tests/data/blank_label.json
index d62d49b..d62d49b 100644
--- a/tests/dbusmenu-gtk/data/blank_label.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/blank_label.json
diff --git a/tests/dbusmenu-gtk/data/blank_label_2levels.json b/tests/dbusmenu-gtk/mago_tests/data/blank_label_2levels.json
index e3335a5..e3335a5 100644
--- a/tests/dbusmenu-gtk/data/blank_label_2levels.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/blank_label_2levels.json
diff --git a/tests/dbusmenu-gtk/data/blank_submenus.json b/tests/dbusmenu-gtk/mago_tests/data/blank_submenus.json
index 2eaff27..2eaff27 100644
--- a/tests/dbusmenu-gtk/data/blank_submenus.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/blank_submenus.json
diff --git a/tests/dbusmenu-gtk/data/dynamic.json b/tests/dbusmenu-gtk/mago_tests/data/dynamic.json
index efa7a75..efa7a75 100644
--- a/tests/dbusmenu-gtk/data/dynamic.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/dynamic.json
diff --git a/tests/dbusmenu-gtk/data/long_label.json b/tests/dbusmenu-gtk/mago_tests/data/long_label.json
index 7cacb7f..7cacb7f 100644
--- a/tests/dbusmenu-gtk/data/long_label.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/long_label.json
diff --git a/tests/dbusmenu-gtk/data/no_id.json b/tests/dbusmenu-gtk/mago_tests/data/no_id.json
index 201408a..201408a 100644
--- a/tests/dbusmenu-gtk/data/no_id.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/no_id.json
diff --git a/tests/dbusmenu-gtk/data/no_label.json b/tests/dbusmenu-gtk/mago_tests/data/no_label.json
index c651cbc..c651cbc 100644
--- a/tests/dbusmenu-gtk/data/no_label.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/no_label.json
diff --git a/tests/dbusmenu-gtk/data/sameid_submenus.json b/tests/dbusmenu-gtk/mago_tests/data/sameid_submenus.json
index a61c92b..a61c92b 100644
--- a/tests/dbusmenu-gtk/data/sameid_submenus.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/sameid_submenus.json
diff --git a/tests/dbusmenu-gtk/data/sameid_submenus_diff_sizes.json b/tests/dbusmenu-gtk/mago_tests/data/sameid_submenus_diff_sizes.json
index d8f36c6..d8f36c6 100644
--- a/tests/dbusmenu-gtk/data/sameid_submenus_diff_sizes.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/sameid_submenus_diff_sizes.json
diff --git a/tests/dbusmenu-gtk/data/sameid_top_and_submenus.json b/tests/dbusmenu-gtk/mago_tests/data/sameid_top_and_submenus.json
index 102720f..102720f 100644
--- a/tests/dbusmenu-gtk/data/sameid_top_and_submenus.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/sameid_top_and_submenus.json
diff --git a/tests/dbusmenu-gtk/data/sameid_topmenu.json b/tests/dbusmenu-gtk/mago_tests/data/sameid_topmenu.json
index ee9d97f..ee9d97f 100644
--- a/tests/dbusmenu-gtk/data/sameid_topmenu.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/sameid_topmenu.json
diff --git a/tests/dbusmenu-gtk/data/several_submenus.json b/tests/dbusmenu-gtk/mago_tests/data/several_submenus.json
index 3b9bb98..3b9bb98 100644
--- a/tests/dbusmenu-gtk/data/several_submenus.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/several_submenus.json
diff --git a/tests/dbusmenu-gtk/data/several_submenus_recursive.json b/tests/dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json
index 1320ef4..1320ef4 100644
--- a/tests/dbusmenu-gtk/data/several_submenus_recursive.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json
diff --git a/tests/dbusmenu-gtk/data/several_submenus_utf8.json b/tests/dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json
index b7b07f9..b7b07f9 100644
--- a/tests/dbusmenu-gtk/data/several_submenus_utf8.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json
diff --git a/tests/dbusmenu-gtk/data/static.json b/tests/dbusmenu-gtk/mago_tests/data/static.json
index dec591a..dec591a 100644
--- a/tests/dbusmenu-gtk/data/static.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/static.json
diff --git a/tests/dbusmenu-gtk/data/test-gtk-label.json b/tests/dbusmenu-gtk/mago_tests/data/test-gtk-label.json
index 64c1386..64c1386 100644
--- a/tests/dbusmenu-gtk/data/test-gtk-label.json
+++ b/tests/dbusmenu-gtk/mago_tests/data/test-gtk-label.json