aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-11-03 15:18:38 -0600
committerTed Gould <ted@canonical.com>2009-11-03 15:18:38 -0600
commit8ef7ed56c860d1d36bfd77a9e60bc1e38e4f7d48 (patch)
treeb8f87b133ed44df986079a690c39b19b8a849359
parentbe7d032e77b2c1140da0d5acee697150cb1a9a2b (diff)
downloadayatana-indicator-application-8ef7ed56c860d1d36bfd77a9e60bc1e38e4f7d48.tar.gz
ayatana-indicator-application-8ef7ed56c860d1d36bfd77a9e60bc1e38e4f7d48.tar.bz2
ayatana-indicator-application-8ef7ed56c860d1d36bfd77a9e60bc1e38e4f7d48.zip
Put the gtester test under a dbus-test-runner to ensure that we have a session bus to test with.
-rw-r--r--.bzrignore1
-rw-r--r--tests/Makefile.am15
2 files changed, 11 insertions, 5 deletions
diff --git a/.bzrignore b/.bzrignore
index 7121e6e..05932c9 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -24,3 +24,4 @@ tests/test-libcustomindicator-dbus-client
tests/test-libcustomindicator-dbus-server
tests/libcustomindicator-tests
tests/test-libcustomindicator-dbus
+tests/libcustomindicator-tests-gtester
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f6a0525..33fe0ba 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -64,12 +64,17 @@ test_libcustomindicator_dbus_server_LDADD = \
XML_REPORT = libcustomindicator-check-results.xml
HTML_REPORT = libcustomindicator-check-results.html
-libcustomindicator-tests: test-libcustomindicator
- @echo "#!/bin/sh" > libcustomindicator-tests
- @echo gtester -k --verbose -o=$(XML_REPORT) ./test-libcustomindicator >> libcustomindicator-tests
- @chmod +x libcustomindicator-tests
+libcustomindicator-tests: libcustomindicator-tests-gtester Makefile.am
+ @echo "#!/bin/sh" > $@
+ @echo $(DBUS_RUNNER) --task ./libcustomindicator-tests-gtester >> $@
+ @chmod +x $@
-TESTS += libcustomindicator-tests
+libcustomindicator-tests-gtester: test-libcustomindicator Makefile.am
+ @echo "#!/bin/sh" > $@
+ @echo gtester -k --verbose -o=$(XML_REPORT) ./test-libcustomindicator >> $@
+ @chmod +x $@
+
+TESTS += libcustomindicator-tests libcustomindicator-tests-gtester
DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT)