aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>2013-02-04 17:02:26 +0000
committerTarmac <Unknown>2013-02-04 17:02:26 +0000
commite0e8251c2cf401d583c7e23a5f78582d472fae6c (patch)
tree15cc1437d313a2c2a4bd3046229f806c75ec1193
parentbd333ad26f451f27f0d412f8a42f42459377bd7c (diff)
parentb266f2604031ff114f70e5dfd6fcc20dbcb5ecde (diff)
downloadlibayatana-appindicator-e0e8251c2cf401d583c7e23a5f78582d472fae6c.tar.gz
libayatana-appindicator-e0e8251c2cf401d583c7e23a5f78582d472fae6c.tar.bz2
libayatana-appindicator-e0e8251c2cf401d583c7e23a5f78582d472fae6c.zip
We don't need to kill at-spi2-registry, that was only meant for testing.
Approved by Didier Roche.
-rw-r--r--tests/Makefile.am4
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3a1ecaf..aed7d7f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -138,7 +138,6 @@ test_libappindicator_fallback_item_LDADD = \
test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am
@echo "#!/bin/bash" > $@
@echo export DISPLAY= >> $@
- @echo killall at-spi2-registryd >> $@
@echo . $(srcdir)/run-xvfb.sh >> $@
@echo $(DBUS_RUNNER) --task ./test-libappindicator-fallback-watcher --task-name Watcher --ignore-return --task ./test-libappindicator-fallback-item --task-name Item >> $@
@chmod +x $@
@@ -155,7 +154,6 @@ HTML_REPORT = libappindicator-check-results.html
libappindicator-tests: libappindicator-tests-gtester Makefile.am
@echo "#!/bin/bash" > $@
@echo export DISPLAY= >> $@
- @echo killall at-spi2-registryd >> $@
@echo . $(srcdir)/run-xvfb.sh >> $@
@echo export UBUNTU_MENUPROXY= >> $@
@echo $(DBUS_RUNNER) --task ./libappindicator-tests-gtester >> $@
@@ -175,7 +173,6 @@ DBUS_RUNNER=dbus-test-runner -m 300 --dbus-config /usr/share/dbus-test-runner/se
test-libappindicator-dbus: test-libappindicator-dbus-client test-libappindicator-dbus-server Makefile.am
@echo "#!/bin/bash" > test-libappindicator-dbus
@echo export DISPLAY= >> $@
- @echo killall at-spi2-registryd >> $@
@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
@@ -186,7 +183,6 @@ XFAIL_TESTS = test-libappindicator-dbus
test-libappindicator-status: test-libappindicator-status-client test-libappindicator-status-server Makefile.am
@echo "#!/bin/bash" > test-libappindicator-status
@echo export DISPLAY= >> $@
- @echo killall at-spi2-registryd >> $@
@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