From d51bf7d31390a50eb79beaf20a10bdcfed28f67b Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 18 Mar 2010 15:07:23 -0400 Subject: Import upstream version 0.2.1 --- tests/Makefile.am | 88 +++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index a0b990b..4767f76 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 +# test-indicator-sound-dbus-client \ +# test-indicator-sound-dbus-server TESTS = DISTCLEANFILES = $(TESTS) @@ -27,67 +27,67 @@ 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_SOURCES = \ +# test-defines.h \ +# test-indicator-sound-dbus-client.c -test_indicator_sound_dbus_client_CFLAGS = \ - $(SOUNDSERVICE_CFLAGS) \ - -Wall -Werror \ - -I$(srcdir) +#test_indicator_sound_dbus_client_CFLAGS = \ +# $(SOUNDSERVICE_CFLAGS) \ +# -Wall -Werror \ +# -I$(srcdir) -test_indicator_sound_dbus_client_LDADD = \ - $(SOUNDSERVICE_LIBS) +#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.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_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) +#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" > $@ - @echo gtester -k --verbose -o=$(XML_REPORT) ./test-indicator-sound >> $@ - @chmod +x $@ +#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 += indicator-sound-tests +#TESTS += indicator-sound-tests -DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) indicator-sound-tests-gtester +#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