From 23b72422d828dd77909f6cc11947f9fb5e8cee2c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 22 Oct 2009 09:30:59 -0500
Subject: Switching to using a little autotest as well.

---
 .bzrignore        |  2 ++
 tests/Makefile.am | 22 ++++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index 6c0da1f..7121e6e 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -22,3 +22,5 @@ tests/libcustomindicator-check-results.html
 tests/test-libcustomindicator
 tests/test-libcustomindicator-dbus-client
 tests/test-libcustomindicator-dbus-server
+tests/libcustomindicator-tests
+tests/test-libcustomindicator-dbus
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8327a79..f6a0525 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,6 +4,9 @@ check_PROGRAMS = \
 	test-libcustomindicator-dbus-client \
 	test-libcustomindicator-dbus-server
 
+TESTS =
+DISTCLEANFILES = $(TESTS)
+
 #########################################
 ##  test-libcustomindicator
 #########################################
@@ -61,10 +64,21 @@ test_libcustomindicator_dbus_server_LDADD = \
 XML_REPORT   = libcustomindicator-check-results.xml
 HTML_REPORT  = libcustomindicator-check-results.html
 
-libcustomindicator-tester: test-libcustomindicator
-	gtester -k --verbose -o=$(XML_REPORT) ./test-libcustomindicator
+libcustomindicator-tests: test-libcustomindicator
+	@echo "#!/bin/sh" > libcustomindicator-tests
+	@echo gtester -k --verbose -o=$(XML_REPORT) ./test-libcustomindicator >> libcustomindicator-tests
+	@chmod +x libcustomindicator-tests
+
+TESTS += libcustomindicator-tests
+DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT)
+
+
+DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
 
-check-local: libcustomindicator-tester
+test-libcustomindicator-dbus: test-libcustomindicator-dbus-client test-libcustomindicator-dbus-server Makefile.am
+	@echo "#!/bin/sh" > test-libcustomindicator-dbus
+	@echo $(DBUS_RUNNER) --task ./test-libcustomindicator-dbus-client --task-name Client --task ./test-libcustomindicator-dbus-server --task-name Server --ignore-return >> test-libcustomindicator-dbus
+	@chmod +x test-libcustomindicator-dbus
 
-DISTCLEANFILES = $(XML_REPORT) $(HTML_REPORT)
+TESTS += test-libcustomindicator-dbus
 
-- 
cgit v1.2.3