From 9a15eec1f5fc9609b877a411564abbf600a22ee5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Mon, 2 Nov 2009 11:17:10 -0600
Subject: Adding in the basic data needed to start bringing up a test to start
 the service.

---
 tests/Makefile.am | 41 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

(limited to 'tests/Makefile.am')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index dd047d3..744c807 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,6 +4,8 @@ DISTCLEANFILES =
 check_PROGRAMS = \
 	test-loader \
 	service-manager-no-connect \
+	service-manager-connect \
+	service-manager-connect-service \
 	service-shutdown-timeout
 
 lib_LTLIBRARIES = \
@@ -120,7 +122,7 @@ service_manager_no_connect_LDADD = \
 	$(LIBINDICATOR_LIBS) \
 	$(top_builddir)/libindicator/.libs/libindicator.a
 
-service-manager-no-connect-tester: service-manager-no-connect Makefile
+service-manager-no-connect-tester: service-manager-no-connect Makefile.am
 	@echo "#!/bin/sh" > service-manager-no-connect-tester
 	@echo $(DBUS_RUNNER) --task ./service-manager-no-connect >> service-manager-no-connect-tester
 	@chmod +x service-manager-no-connect-tester
@@ -128,6 +130,43 @@ service-manager-no-connect-tester: service-manager-no-connect Makefile
 TESTS += service-manager-no-connect-tester
 DISTCLEANFILES += service-manager-no-connect-tester
 
+#############################
+# Service Manager Connect
+#############################
+
+session.conf: session.conf.in Makefile.am
+	sed -e "s|\@servicedir\@|$(abspath $(builddir))|" $< > $@
+
+service_manager_connect_SOURCES = \
+	service-manager-connect.c
+
+service_manager_connect_CFLAGS = \
+	-Wall -Werror \
+	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+
+service_manager_connect_LDADD = \
+	$(LIBINDICATOR_LIBS) \
+	$(top_builddir)/libindicator/.libs/libindicator.a
+
+service_manager_connect_service_SOURCES = \
+	service-manager-connect-service.c
+
+service_manager_connect_service_CFLAGS = \
+	-Wall -Werror \
+	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+
+service_manager_connect_service_LDADD = \
+	$(LIBINDICATOR_LIBS) \
+	$(top_builddir)/libindicator/.libs/libindicator.a
+
+service-manager-connect-tester: service-manager-connect service-manager-connect-service session.conf Makefile.am
+	@echo "#!/bin/sh" > service-manager-connect-tester
+	@echo dbus-test-runner --dbus-config $(builddir)/session.conf --task ./service-manager-connect >> service-manager-connect-tester
+	@chmod +x service-manager-connect-tester
+
+TESTS += service-manager-connect-tester
+DISTCLEANFILES += service-manager-connect-tester
+
 #############################
 # Test stuff
 #############################
-- 
cgit v1.2.3