20 files changed, 56 insertions, 13 deletions
diff --git a/tests/dbusmenu-gtk/Makefile.am b/tests/dbusmenu-gtk/Makefile.am
new file mode 100644
index 0000000..6acbbe0
--- /dev/null
+++ b/tests/dbusmenu-gtk/Makefile.am
@@ -0,0 +1,43 @@
+
+check: tests
+
+tests: mago
+
+mago: dbusmenu.xml dbusmenu.py
+	PYTHONPATH=$(builddir) mago -f $(builddir)/dbusmenu.xml -t $(builddir)/mago.results
+
+dbusmenu.xml: dbusmenu.xml.in
+	sed -e "s|\@srcdir\@|$(srcdir)|" $< > $@
+
+dbusmenu.py: dbusmenu.py.in
+	sed -e "s|\@srcdir\@|$(srcdir)|" $< > $@
+
+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
+
+CLEANFILES = \
+	dbusmenu.xml \
+	dbusmenu.pyc \
+	dbusmenu.py
+
+distclean-local:
+	-rm -rf $(builddir)/mago.results
+
diff --git a/tests/dbusmenu-gtk/mago_tests/data/blank_label.json b/tests/dbusmenu-gtk/data/blank_label.json
index d62d49b..d62d49b 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/blank_label.json
+++ b/tests/dbusmenu-gtk/data/blank_label.json
diff --git a/tests/dbusmenu-gtk/mago_tests/data/blank_label_2levels.json b/tests/dbusmenu-gtk/data/blank_label_2levels.json
index e3335a5..e3335a5 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/blank_label_2levels.json
+++ b/tests/dbusmenu-gtk/data/blank_label_2levels.json
diff --git a/tests/dbusmenu-gtk/mago_tests/data/blank_submenus.json b/tests/dbusmenu-gtk/data/blank_submenus.json
index 2eaff27..2eaff27 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/blank_submenus.json
+++ b/tests/dbusmenu-gtk/data/blank_submenus.json
diff --git a/tests/dbusmenu-gtk/mago_tests/data/dynamic.json b/tests/dbusmenu-gtk/data/dynamic.json
index efa7a75..efa7a75 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/dynamic.json
+++ b/tests/dbusmenu-gtk/data/dynamic.json
diff --git a/tests/dbusmenu-gtk/mago_tests/data/long_label.json b/tests/dbusmenu-gtk/data/long_label.json
index 7cacb7f..7cacb7f 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/long_label.json
+++ b/tests/dbusmenu-gtk/data/long_label.json
diff --git a/tests/dbusmenu-gtk/mago_tests/data/no_id.json b/tests/dbusmenu-gtk/data/no_id.json
index 201408a..201408a 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/no_id.json
+++ b/tests/dbusmenu-gtk/data/no_id.json
diff --git a/tests/dbusmenu-gtk/mago_tests/data/no_label.json b/tests/dbusmenu-gtk/data/no_label.json
index c651cbc..c651cbc 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/no_label.json
+++ b/tests/dbusmenu-gtk/data/no_label.json
diff --git a/tests/dbusmenu-gtk/mago_tests/data/sameid_submenus.json b/tests/dbusmenu-gtk/data/sameid_submenus.json
index a61c92b..a61c92b 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/sameid_submenus.json
+++ b/tests/dbusmenu-gtk/data/sameid_submenus.json
diff --git a/tests/dbusmenu-gtk/mago_tests/data/sameid_submenus_diff_sizes.json b/tests/dbusmenu-gtk/data/sameid_submenus_diff_sizes.json
index d8f36c6..d8f36c6 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/sameid_submenus_diff_sizes.json
+++ b/tests/dbusmenu-gtk/data/sameid_submenus_diff_sizes.json
diff --git a/tests/dbusmenu-gtk/mago_tests/data/sameid_top_and_submenus.json b/tests/dbusmenu-gtk/data/sameid_top_and_submenus.json
index 102720f..102720f 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/sameid_top_and_submenus.json
+++ b/tests/dbusmenu-gtk/data/sameid_top_and_submenus.json
diff --git a/tests/dbusmenu-gtk/mago_tests/data/sameid_topmenu.json b/tests/dbusmenu-gtk/data/sameid_topmenu.json
index ee9d97f..ee9d97f 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/sameid_topmenu.json
+++ b/tests/dbusmenu-gtk/data/sameid_topmenu.json
diff --git a/tests/dbusmenu-gtk/mago_tests/data/several_submenus.json b/tests/dbusmenu-gtk/data/several_submenus.json
index 3b9bb98..3b9bb98 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/several_submenus.json
+++ b/tests/dbusmenu-gtk/data/several_submenus.json
diff --git a/tests/dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json b/tests/dbusmenu-gtk/data/several_submenus_recursive.json
index 1320ef4..1320ef4 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json
+++ b/tests/dbusmenu-gtk/data/several_submenus_recursive.json
diff --git a/tests/dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json b/tests/dbusmenu-gtk/data/several_submenus_utf8.json
index b7b07f9..b7b07f9 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json
+++ b/tests/dbusmenu-gtk/data/several_submenus_utf8.json
diff --git a/tests/dbusmenu-gtk/mago_tests/data/static.json b/tests/dbusmenu-gtk/data/static.json
index dec591a..dec591a 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/static.json
+++ b/tests/dbusmenu-gtk/data/static.json
diff --git a/tests/dbusmenu-gtk/mago_tests/data/test-gtk-label.json b/tests/dbusmenu-gtk/data/test-gtk-label.json
index 64c1386..64c1386 100644
--- a/tests/dbusmenu-gtk/mago_tests/data/test-gtk-label.json
+++ b/tests/dbusmenu-gtk/data/test-gtk-label.json
diff --git a/tests/dbusmenu-gtk/dbusMenuTest b/tests/dbusmenu-gtk/dbusMenuTest
index 55a791b..46c5f67 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 $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
+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
 
 
diff --git a/tests/dbusmenu-gtk/mago_tests/dbusmenu.py b/tests/dbusmenu-gtk/dbusmenu.py.in
index 5e9f691..ce159e1 100644
--- a/tests/dbusmenu-gtk/mago_tests/dbusmenu.py
+++ b/tests/dbusmenu-gtk/dbusmenu.py.in
@@ -1,10 +1,10 @@
 from mago.test_suite.main import SingleApplicationTestSuite 
 from mago.application.main import Application 
 
-import ldtp, ooldtp, ldtputils, os.path
+import ldtp, ooldtp, ldtputils
 
 class DbusMenuGtkApp():
-    LAUNCHER = os.path.join(os.path.dirname(__file__), "..", "dbusMenuTest")
+    LAUNCHER = "@srcdir@/dbusMenuTest"
     WINDOW   = "frmlibdbusmenu-gtktest"
 
     def open(self, menu_schema=''):
diff --git a/tests/dbusmenu-gtk/mago_tests/dbusmenu.xml b/tests/dbusmenu-gtk/dbusmenu.xml.in
index d02191e..b49ee5e 100644
--- a/tests/dbusmenu-gtk/mago_tests/dbusmenu.xml
+++ b/tests/dbusmenu-gtk/dbusmenu.xml.in
@@ -8,7 +8,7 @@
     <method>testStaticMenu</method>
     <description>Simple check for a menu </description>
     <args>
-        <menu_schema>data/static.json</menu_schema>
+        <menu_schema>@srcdir@/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>data/blank_label.json</menu_schema>
+        <menu_schema>@srcdir@/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>data/blank_submenus.json</menu_schema>
+        <menu_schema>@srcdir@/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>data/long_label.json</menu_schema>
+        <menu_schema>@srcdir@/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>data/no_id.json</menu_schema>
+        <menu_schema>@srcdir@/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>data/blank_label_2levels.json</menu_schema>
+        <menu_schema>@srcdir@/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>data/no_label.json</menu_schema>
+        <menu_schema>@srcdir@/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>data/several_submenus.json</menu_schema>
+        <menu_schema>@srcdir@/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>data/several_submenus_recursive.json</menu_schema>
+        <menu_schema>@srcdir@/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>data/several_submenus_utf8.json</menu_schema>
+      <menu_schema>@srcdir@/data/several_submenus_utf8.json</menu_schema>
       <menu_item>value5ス</menu_item>
     </args>
  </case>