aboutsummaryrefslogtreecommitdiff
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2010-03-02 10:20:25 +0000
committerConor Curran <conor.curran@canonical.com>2010-03-02 10:20:25 +0000
commitbe2b2e73044d5ba0c656431f0d19723af6b55946 (patch)
tree0916a0332591d2dc3b048c40164a5803098842ee /tests/Makefile.am
parenta6152fcf5ec57d7252617a7ede36aa53de7f2930 (diff)
downloadayatana-indicator-sound-be2b2e73044d5ba0c656431f0d19723af6b55946.tar.gz
ayatana-indicator-sound-be2b2e73044d5ba0c656431f0d19723af6b55946.tar.bz2
ayatana-indicator-sound-be2b2e73044d5ba0c656431f0d19723af6b55946.zip
refactored the indicator tests so as no c file needs to be included
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am41
1 files changed, 21 insertions, 20 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 285a26c..b20b070 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 =
DISTCLEANFILES = $(TESTS)
@@ -44,20 +44,21 @@ test_indicator_sound_dbus_client_LDADD = \
#########################################
## test-indicator-sound-dbus-server
#########################################
-test_indicator_sound_dbus_server_SOURCES = \
- test-defines.h \
- test-indicator-sound-dbus-server.c
-
-test_indicator_sound_dbus_server_CFLAGS = \
- $(APPLET_CFLAGS) \
- -Wall -Werror \
- -I$(srcdir) \
- -I$(SOUNDSERVICE_CFLAGS)
+#test_indicator_sound_dbus_server_SOURCES = \
+# test-defines.h
-test_indicator_sound_dbus_server_LDADD = \
- $(SOUNDSERVICE_LIBS) \
- $(top_builddir)/src/libsoundmenu.la
+#test_indicator_sound_dbus_server_CFLAGS = \
+# $(SOUNDSERVICE_CFLAGS) \
+# -Wall -Werror \
+# -I$(srcdir) \
+# -I$(SOUNDSERVICE_CFLAGS)
+#test_indicator_sound_dbus_server_LDADD = \
+# $(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
@@ -83,14 +84,14 @@ TESTS += indicator-sound-tests
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