aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2009-11-24 16:40:47 -0600
committerTed Gould <ted@gould.cx>2009-11-24 16:40:47 -0600
commitacbab334ce6b9cef6d80c94d29aac7fb35534b4d (patch)
treecd5cbf08a4b4a6acd7c4d6b31d91f36ce805e996 /tests
parent4b23fc39d2fed996dd651d101dc1fb0a5b76d8f0 (diff)
parentf23c54ff5fee5587c31ecb8bf176b58fa3d4be1d (diff)
downloadayatana-indicator-application-acbab334ce6b9cef6d80c94d29aac7fb35534b4d.tar.gz
ayatana-indicator-application-acbab334ce6b9cef6d80c94d29aac7fb35534b4d.tar.bz2
ayatana-indicator-application-acbab334ce6b9cef6d80c94d29aac7fb35534b4d.zip
Merging in changes on trunk. Resolving a conflict.
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am15
1 files changed, 10 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 39cd3a6..0b771db 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -65,13 +65,18 @@ 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 $@
+
+libcustomindicator-tests-gtester: test-libcustomindicator Makefile.am
+ @echo "#!/bin/sh" > $@
+ @echo gtester -k --verbose -o=$(XML_REPORT) ./test-libcustomindicator >> $@
+ @chmod +x $@
TESTS += libcustomindicator-tests
-DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT)
+DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) libcustomindicator-tests-gtester
DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf