diff options
| author | Conor Curran <conor.curran@canonical.com> | 2010-03-03 15:05:08 +0000 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2010-03-03 15:05:08 +0000 |
| commit | 259f58ec21be89f22f478243f4c8acf9a44231f9 (patch) | |
| tree | 5bd8e50cdbe31544a4277cb74b4c764d0f86eee4 /tests | |
| parent | 4bde209ef0f8ad381d70b2ade7eb3cf834eed074 (diff) | |
| download | ayatana-indicator-sound-259f58ec21be89f22f478243f4c8acf9a44231f9.tar.gz ayatana-indicator-sound-259f58ec21be89f22f478243f4c8acf9a44231f9.tar.bz2 ayatana-indicator-sound-259f58ec21be89f22f478243f4c8acf9a44231f9.zip | |
tests compiling
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 70 | ||||
| -rw-r--r-- | tests/test-indicator-sound-dbus-client.c | 9 |
2 files changed, 39 insertions, 40 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index ad985f4..a0b990b 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) @@ -27,53 +27,49 @@ test_indicator_sound_LDADD = \ ######################################### ## 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.c test_indicator_sound_dbus_client_CFLAGS = \ $(SOUNDSERVICE_CFLAGS) \ -Wall -Werror \ - -I$(srcdir) \ - -I$(SOUNDSERVICE_CFLAGS) + -I$(srcdir) test_indicator_sound_dbus_client_LDADD = \ $(SOUNDSERVICE_LIBS) -######################################### -## test-indicator-sound-dbus-server -######################################### -#test_indicator_sound_dbus_server_SOURCES = \ -# test-defines.h - -#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 - +######################################## +# 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) ######################################### ## 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" > $@ @@ -84,14 +80,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 diff --git a/tests/test-indicator-sound-dbus-client.c b/tests/test-indicator-sound-dbus-client.c index dc36ae3..08ce93e 100644 --- a/tests/test-indicator-sound-dbus-client.c +++ b/tests/test-indicator-sound-dbus-client.c @@ -25,7 +25,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <glib.h> #include <dbus/dbus-glib.h> #include "../src/dbus-shared-names.h" -/*#include "../src/indicator-sound.c"*/ #include "test-defines.h" static GMainLoop * mainloop = NULL; @@ -78,10 +77,14 @@ main (gint argc, gchar * argv[]) } DBusGProxy * props = dbus_g_proxy_new_for_name_owner(session_bus, - INDICATOR_SOUND_DBUS_NAME, + INDICATOR_SOUND_DBUS_NAME, INDICATOR_SOUND_SERVICE_DBUS_OBJECT, INDICATOR_SOUND_SERVICE_DBUS_INTERFACE, - &error); + &error); +/* ":1.0",*/ +/* "/need/a/path",*/ +/* DBUS_INTERFACE_PROPERTIES,*/ +/* &error);*/ if (error != NULL) { g_error("Unable to get property proxy: %s", error->message); return 1; |