Import upstream version 0.2.3

1 files changed, 61 insertions, 9 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index edc828f..dc4be9b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -33,7 +33,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-check_PROGRAMS = test-libappindicator$(EXEEXT) \
+check_PROGRAMS = test-approver$(EXEEXT) test-libappindicator$(EXEEXT) \
 	test-libappindicator-dbus-client$(EXEEXT) \
 	test-libappindicator-dbus-server$(EXEEXT) \
 	test-libappindicator-status-client$(EXEEXT) \
@@ -52,15 +52,22 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am_test_libappindicator_OBJECTS =  \
-	test_libappindicator-test-libappindicator.$(OBJEXT)
-test_libappindicator_OBJECTS = $(am_test_libappindicator_OBJECTS)
+am_test_approver_OBJECTS = test_approver-test-approver.$(OBJEXT)
+test_approver_OBJECTS = $(am_test_approver_OBJECTS)
 am__DEPENDENCIES_1 =
-test_libappindicator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+test_approver_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/src/libappindicator.la
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
+test_approver_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_approver_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_test_libappindicator_OBJECTS =  \
+	test_libappindicator-test-libappindicator.$(OBJEXT)
+test_libappindicator_OBJECTS = $(am_test_libappindicator_OBJECTS)
+test_libappindicator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(top_builddir)/src/libappindicator.la
 test_libappindicator_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(test_libappindicator_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -154,7 +161,7 @@ am__v_CCLD_0 = @echo "  CCLD  " $@;
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(test_libappindicator_SOURCES) \
+SOURCES = $(test_approver_SOURCES) $(test_libappindicator_SOURCES) \
 	$(test_libappindicator_dbus_client_SOURCES) \
 	$(test_libappindicator_dbus_server_SOURCES) \
 	$(test_libappindicator_fallback_item_SOURCES) \
@@ -162,7 +169,8 @@ SOURCES = $(test_libappindicator_SOURCES) \
 	$(test_libappindicator_status_client_SOURCES) \
 	$(test_libappindicator_status_server_SOURCES) \
 	$(test_simple_app_SOURCES)
-DIST_SOURCES = $(test_libappindicator_SOURCES) \
+DIST_SOURCES = $(test_approver_SOURCES) \
+	$(test_libappindicator_SOURCES) \
 	$(test_libappindicator_dbus_client_SOURCES) \
 	$(test_libappindicator_dbus_server_SOURCES) \
 	$(test_libappindicator_fallback_item_SOURCES) \
@@ -341,8 +349,9 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-TESTS = test-libappindicator-fallback libappindicator-tests \
-	test-libappindicator-dbus test-libappindicator-status
+TESTS = test-approver-tester test-libappindicator-fallback \
+	libappindicator-tests test-libappindicator-dbus \
+	test-libappindicator-status
 DISTCLEANFILES = $(TESTS) $(XML_REPORT) $(HTML_REPORT) \
 	libappindicator-tests-gtester
 EXTRA_DIST = run-xvfb.sh
@@ -428,6 +437,22 @@ test_libappindicator_status_server_LDADD = \
 
 #########################################
 #########################################
+test_approver_SOURCES = \
+	test-approver.c
+
+test_approver_CFLAGS = \
+	$(INDICATOR_CFLAGS) \
+	-Wall -Werror \
+	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src
+
+test_approver_LDADD = \
+	$(INDICATOR_LIBS) \
+	$(top_builddir)/src/libappindicator.la
+
+
+#########################################
+#########################################
 test_libappindicator_fallback_watcher_SOURCES = \
 	test-libappindicator-fallback-watcher.c
 
@@ -516,6 +541,9 @@ clean-checkPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+test-approver$(EXEEXT): $(test_approver_OBJECTS) $(test_approver_DEPENDENCIES) 
+	@rm -f test-approver$(EXEEXT)
+	$(AM_V_CCLD)$(test_approver_LINK) $(test_approver_OBJECTS) $(test_approver_LDADD) $(LIBS)
 test-libappindicator$(EXEEXT): $(test_libappindicator_OBJECTS) $(test_libappindicator_DEPENDENCIES) 
 	@rm -f test-libappindicator$(EXEEXT)
 	$(AM_V_CCLD)$(test_libappindicator_LINK) $(test_libappindicator_OBJECTS) $(test_libappindicator_LDADD) $(LIBS)
@@ -547,6 +575,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_approver-test-approver.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_libappindicator-test-libappindicator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_libappindicator_dbus_client-test-libappindicator-dbus-client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_libappindicator_dbus_server-test-libappindicator-dbus-server.Po@am__quote@
@@ -580,6 +609,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+test_approver-test-approver.o: test-approver.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_approver_CFLAGS) $(CFLAGS) -MT test_approver-test-approver.o -MD -MP -MF $(DEPDIR)/test_approver-test-approver.Tpo -c -o test_approver-test-approver.o `test -f 'test-approver.c' || echo '$(srcdir)/'`test-approver.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_approver-test-approver.Tpo $(DEPDIR)/test_approver-test-approver.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-approver.c' object='test_approver-test-approver.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_approver_CFLAGS) $(CFLAGS) -c -o test_approver-test-approver.o `test -f 'test-approver.c' || echo '$(srcdir)/'`test-approver.c
+
+test_approver-test-approver.obj: test-approver.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_approver_CFLAGS) $(CFLAGS) -MT test_approver-test-approver.obj -MD -MP -MF $(DEPDIR)/test_approver-test-approver.Tpo -c -o test_approver-test-approver.obj `if test -f 'test-approver.c'; then $(CYGPATH_W) 'test-approver.c'; else $(CYGPATH_W) '$(srcdir)/test-approver.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_approver-test-approver.Tpo $(DEPDIR)/test_approver-test-approver.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-approver.c' object='test_approver-test-approver.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_approver_CFLAGS) $(CFLAGS) -c -o test_approver-test-approver.obj `if test -f 'test-approver.c'; then $(CYGPATH_W) 'test-approver.c'; else $(CYGPATH_W) '$(srcdir)/test-approver.c'; fi`
+
 test_libappindicator-test-libappindicator.o: test-libappindicator.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_CFLAGS) $(CFLAGS) -MT test_libappindicator-test-libappindicator.o -MD -MP -MF $(DEPDIR)/test_libappindicator-test-libappindicator.Tpo -c -o test_libappindicator-test-libappindicator.o `test -f 'test-libappindicator.c' || echo '$(srcdir)/'`test-libappindicator.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator-test-libappindicator.Tpo $(DEPDIR)/test_libappindicator-test-libappindicator.Po
@@ -1008,6 +1053,13 @@ uninstall-am:
 	tags uninstall uninstall-am
 
 
+test-approver-tester: test-approver Makefile.am
+	@echo "#!/bin/bash" > $@
+	@echo export INDICATOR_SERVICE_SHUTDOWN_TIMEOUT=1000 >> $@
+	@echo . $(srcdir)/run-xvfb.sh >> $@
+	@echo $(DBUS_RUNNER) --task $(builddir)/test-approver --task-name Approver --task $(top_builddir)/src/indicator-application-service --task-name Service --ignore-return >> $@
+	@chmod +x $@
+
 test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am
 	@echo "#!/bin/bash" > $@
 	@echo . $(srcdir)/run-xvfb.sh >> $@