aboutsummaryrefslogtreecommitdiff
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2010-03-01 21:54:03 +0000
committerConor Curran <conor.curran@canonical.com>2010-03-01 21:54:03 +0000
commit6468402475d7bfced0ee905bdd56977cc2f4b7da (patch)
tree41defecba1b06a2b94cd666bebd53e3ac1619844 /tests/Makefile.am
parent4cb7db538df7b4e69e49ab047f401b8ba480f224 (diff)
downloadayatana-indicator-sound-6468402475d7bfced0ee905bdd56977cc2f4b7da.tar.gz
ayatana-indicator-sound-6468402475d7bfced0ee905bdd56977cc2f4b7da.tar.bz2
ayatana-indicator-sound-6468402475d7bfced0ee905bdd56977cc2f4b7da.zip
new tests for dbus stuff
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am81
1 files changed, 60 insertions, 21 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4404333..7d061fb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,8 @@
check_PROGRAMS = \
test-indicator-sound
+ test-indicator-sound-dbus-client \
+ test-indicator-sound-dbus-server
TESTS =
DISTCLEANFILES = $(TESTS)
@@ -21,35 +23,72 @@ test_indicator_sound_LDADD = \
$(APPLET_LIBS) \
$(INDICATORDIR)/libsoundmenu.la
-#DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
+#########################################
+## test-indicator-sound-dbus-client
+#########################################
+
+test_indicator_sound_dbus_client_SOURCES = \
+ test-defines.h \
+ test-indicator-sound-dbus-client.c
+
+test_indicator_sound_dbus_client_CFLAGS = \
+ $(SOUNDSERVICE_CFLAGS) \
+ -Wall -Werror \
+ -I$(srcdir) \
+ -I$(SOUNDSERVICE_CFLAGS)
+
+test_indicator_sound_dbus_client_LDADD = \
+ $(SOUNDSERVICE_LIBS) \
+ $(INDICATORDIR)/libsoundmenu.la
+
+#########################################
+## 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)
+
+test_libappindicator_dbus_server_LDADD = \
+ $(SOUNDSERVICE_LIBS) \
+ $(INDICATORDIR)/libsoundmenu.la
+
+
+#########################################
+## Actual tests
+#########################################
+
+#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 $@
-#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-libappindicator-dbus
+indicator-sound-tests-gtester: test-indicator-sound Makefile.am
+ @echo "#!/bin/sh" > $@
+ @echo gtester -k --verbose -o=$(XML_REPORT) ./test-indicator-sound >> $@
+ @chmod +x $@
-#TESTS += test-libappindicator-dbus
+TESTS += indicator-sound-tests
-XVFB_RUN=". $(srcdir)/run-xvfb.sh"
+DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) indicator-sound-tests-gtester
-EXTRA_DIST = run-xvfb.sh
+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 stuff
-#############################
+TESTS += test-indicator-sound-dbus
-#XML_REPORT = loader-check-results.xml
-#HTML_REPORT = loader-check-results.html
-#loader-tester: test-loader libsoundmenu.la Makefile
-# @echo "#!/bin/bash" > loader-tester
-# @echo $(XVFB_RUN) >> $@
-# @echo gtester -k --verbose -o=$(XML_REPORT) ./test-loader >> loader-tester
-# @chmod +x loader-tester
-#TESTS += loader-tester
-#DISTCLEANFILES += loader-tester
-#DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT)