aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-10-10 15:40:47 -0400
committerTed Gould <ted@canonical.com>2009-10-10 15:40:47 -0400
commit462d25ae76f833ca7ac977406045833bb29fbbb4 (patch)
tree987e516ef16d072817fa85215d7d2924972e0241
parent7d5da2654470e74cd6eb41facc8b68a2c74289cc (diff)
downloadlibdbusmenu-462d25ae76f833ca7ac977406045833bb29fbbb4.tar.gz
libdbusmenu-462d25ae76f833ca7ac977406045833bb29fbbb4.tar.bz2
libdbusmenu-462d25ae76f833ca7ac977406045833bb29fbbb4.zip
Getting the build directly through to the script.
-rw-r--r--tests/Makefile.am1
-rwxr-xr-xtests/dbusmenu-gtk/dbusMenuTest2
2 files changed, 2 insertions, 1 deletions
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
diff --git a/tests/dbusmenu-gtk/dbusMenuTest b/tests/dbusmenu-gtk/dbusMenuTest
index 0815a79..55a791b 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 ./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