aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-10 10:53:00 -0600
committerTed Gould <ted@gould.cx>2010-02-10 10:53:00 -0600
commitec5e7ea86df0da2859bfe4de9d668ce66987d8ab (patch)
tree815836f52b41fafe2844c532e55afee9c625b97d
parent6f79c17699cc45ea58491f9da176783264746179 (diff)
downloadayatana-indicator-application-ec5e7ea86df0da2859bfe4de9d668ce66987d8ab.tar.gz
ayatana-indicator-application-ec5e7ea86df0da2859bfe4de9d668ce66987d8ab.tar.bz2
ayatana-indicator-application-ec5e7ea86df0da2859bfe4de9d668ce66987d8ab.zip
Making sure our new tests with gtk_init() in them have an X server to talk to.
-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