aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore1
-rw-r--r--tests/Makefile.am10
2 files changed, 11 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index cfc3a2c..1bdd142 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -123,3 +123,4 @@ libindicator/libindicator_la-indicator-service.lo
libindicator/libindicator_la-indicator-service-manager.lo
tests/service-shutdown-timeout
tests/loader-tester
+tests/service-shutdown-timeout-tester
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bacdce6..485d02e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,6 +10,8 @@ lib_LTLIBRARIES = \
libdummy-indicator-null.la \
libdummy-indicator-simple.la
+DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
+
#############################
# Test Loader
#############################
@@ -94,6 +96,14 @@ service_shutdown_timeout_LDADD = \
$(LIBINDICATOR_LIBS) \
$(top_builddir)/libindicator/.libs/libindicator.a
+service-shutdown-timeout-tester: service-shutdown-timeout Makefile
+ @echo "#!/bin/sh" > service-shutdown-timeout-tester
+ @echo $(DBUS_RUNNER) --task ./service-shutdown-timeout >> service-shutdown-timeout-tester
+ @chmod +x service-shutdown-timeout-tester
+
+TESTS += service-shutdown-timeout-tester
+DISTCLEANFILES += service-shutdown-timeout-tester
+
#############################
# Test stuff
#############################