diff options
| author | Ted Gould <ted@gould.cx> | 2009-11-24 17:07:41 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2009-11-24 17:07:41 -0600 |
| commit | 62a7252cd51aa817f8f4a5fc338ba601c022133b (patch) | |
| tree | f832f53ae154905e8079f4b5732190b5b5fb18f3 /tests | |
| parent | 7c86b00eba7f9cb4afd72d349c3579bb5f3ab5c3 (diff) | |
| parent | 8c7ce8faffe025e5c5cf8f4f23d9cf97cf719533 (diff) | |
| download | ayatana-indicator-application-62a7252cd51aa817f8f4a5fc338ba601c022133b.tar.gz ayatana-indicator-application-62a7252cd51aa817f8f4a5fc338ba601c022133b.tar.bz2 ayatana-indicator-application-62a7252cd51aa817f8f4a5fc338ba601c022133b.zip | |
Sync to trunk and fix distcheck by delaying connecting to
the service by checking for data.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 15 |
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 |