aboutsummaryrefslogtreecommitdiff
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-11 08:41:13 -0600
committerTed Gould <ted@gould.cx>2010-02-11 08:41:13 -0600
commit0e783eb26287d21359e4c23beb26601300c5b353 (patch)
tree815836f52b41fafe2844c532e55afee9c625b97d /tests/Makefile.am
parent07cba3340daeb169dc1e2ef28c01bafa7fb60448 (diff)
parentec5e7ea86df0da2859bfe4de9d668ce66987d8ab (diff)
downloadayatana-indicator-application-0e783eb26287d21359e4c23beb26601300c5b353.tar.gz
ayatana-indicator-application-0e783eb26287d21359e4c23beb26601300c5b353.tar.bz2
ayatana-indicator-application-0e783eb26287d21359e4c23beb26601300c5b353.zip
Fix to make the dbus paths unique by using the ID of the application.
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 03e2091..d42ed2b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -158,14 +158,16 @@ DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) libappindicator-tests-gtester
DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
test-libappindicator-dbus: test-libappindicator-dbus-client test-libappindicator-dbus-server Makefile.am
- @echo "#!/bin/sh" > test-libappindicator-dbus
+ @echo "#!/bin/bash" > test-libappindicator-dbus
+ @echo . $(srcdir)/run-xvfb.sh >> $@
@echo $(DBUS_RUNNER) --task ./test-libappindicator-dbus-client --task-name Client --task ./test-libappindicator-dbus-server --task-name Server --ignore-return >> test-libappindicator-dbus
@chmod +x test-libappindicator-dbus
TESTS += test-libappindicator-dbus
test-libappindicator-status: test-libappindicator-status-client test-libappindicator-status-server Makefile.am
- @echo "#!/bin/sh" > test-libappindicator-status
+ @echo "#!/bin/bash" > test-libappindicator-status
+ @echo . $(srcdir)/run-xvfb.sh >> $@
@echo $(DBUS_RUNNER) --task ./test-libappindicator-status-client --task-name Client --task ./test-libappindicator-status-server --task-name Server --ignore-return >> test-libappindicator-status
@chmod +x test-libappindicator-status