From 230210f34c0a3cea1de4d95697d7bbec65420750 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Mon, 8 Mar 2010 19:51:41 +0000
Subject: merged makefile with fixes from other work to enable dbus-test-runner
 tests to work

---
 tests/Makefile.am | 69 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 33 insertions(+), 36 deletions(-)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e29df33..bbae7fe 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,8 @@
 
 check_PROGRAMS = \
 	test-indicator-sound \
-	test-indicator-sound-dbus-client 
-#	test-indicator-sound-dbus-server 
+	test-indicator-sound-dbus-client \
+	test-indicator-sound-dbus-server 
 
 TESTS = test-indicator-sound
 DISTCLEANFILES = $(TESTS)
@@ -52,42 +52,38 @@ test_indicator_sound_dbus_client_LDADD = \
 	$(PULSEAUDIO_LIBS) \
 	$(SOUNDSERVICE_LIBS)
 
-#########################################
-##  test-indicator-sound-dbus-server
-#########################################
-#test_indicator_sound_dbus_server_SOURCES = \
-#	test-defines.h 
-
-#test_indicator_sound_dbus_server_CFLAGS = \
-#	$(PULSEAUDIO_CFLAGS) \
-#    $(SOUNDSERVICE_CFLAGS) \
-#	-Wall -Werror \
-#	-I$(srcdir) \
-#    -I$(SOUNDSERVICE_CFLAGS)
-
-#test_indicator_sound_dbus_server_LDADD = \
-#	libmockpulse.la \
-#	$(PULSEAUDIO_LIBS) \
-#	$(SOUNDSERVICE_LIBS) \
-#	$(top_builddir)/src/indicator_sound_service-sound-service.o \
-#	$(top_builddir)/src/indicator_sound_service-pulse-manager.o \
-#    $(top_builddir)/src/indicator_sound_service-slider-menu-item.o \
-#	$(top_builddir)/src/indicator_sound_service-sound-service-dbus.o 
-
+########################################
+#  test-indicator-sound-dbus-server
+########################################
+test_indicator_sound_dbus_server_SOURCES = \
+	test-defines.h \
+    test-indicator-sound-dbus-server.c \
+    $(top_builddir)/src/sound-service-dbus.c \
+    $(top_builddir)/src/pulse-manager.c \
+    $(top_builddir)/src/slider-menu-item.c \
+    $(top_builddir)/src/dbus-menu-manager.c
+
+test_indicator_sound_dbus_server_CFLAGS = \
+    $(SOUNDSERVICE_CFLAGS) \
+	-Wall -Werror \
+	-I$(srcdir) 
 
+test_indicator_sound_dbus_server_LDADD = \
+	$(SOUNDSERVICE_LIBS) \ 
+	$(PULSEAUDIO_LIBS) 
 
 
 #########################################
 ##  Actual tests
 #########################################
 
-#XML_REPORT   = indicator-sound-check-results.xml
-#HTML_REPORT  = indicator-sound-check-results.html
+XML_REPORT   = indicator-sound-check-results.xml
+HTML_REPORT  = indicator-sound-check-results.html
 
-#indicator-sound-tests: indicator-sound-tests-gtester Makefile.am
-#	@echo "#!/bin/sh" > $@
-#	@echo $(DBUS_RUNNER) --task ./indicator-sound-tests-gtester >> $@
-#	@chmod +x $@
+indicator-sound-tests: indicator-sound-tests-gtester Makefile.am
+	@echo "#!/bin/sh" > $@
+	@echo $(DBUS_RUNNER) --task ./indicator-sound-tests-gtester >> $@
+	@chmod +x $@
 
 indicator-sound-tests-gtester: test-indicator-sound Makefile.am
 	@echo "#!/bin/sh" > $@
@@ -98,14 +94,15 @@ indicator-sound-tests-gtester: test-indicator-sound Makefile.am
 
 DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) indicator-sound-tests-gtester
 
-#DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
+DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
+
+test-indicator-sound-dbus: test-indicator-sound-dbus-client test-indicator-sound-dbus-server Makefile.am
+	@echo "#!/bin/sh" > test-indicator-sound-dbus
+	@echo $(DBUS_RUNNER) --task ./test-indicator-sound-dbus-client --task-name Client --task ./test-indicator-sound-dbus-server --task-name Server --ignore-return >> test-indicator-sound-dbus
+	@chmod +x test-indicator-sound-dbus
 
-#test-indicator-sound-dbus: test-indicator-sound-dbus-client test-indicator-sound-dbus-server Makefile.am
-#	@echo "#!/bin/sh" > test-indicator-sound-dbus
-#	@echo $(DBUS_RUNNER) --task ./test-indicator-sound-dbus-client --task-name Client --task ./test-indicator-sound-dbus-server --task-name Server --ignore-return >> test-indicator-sound-dbus
-#	@chmod +x test-indicator-sound-dbus
+TESTS += test-indicator-sound-dbus
 
-#TESTS += test-indicator-sound-dbus
 
 
 
-- 
cgit v1.2.3