Imported Upstream version 1.4.14upstream/1.4.14

1 files changed, 14 insertions, 108 deletions

diff --git a/bus/Makefile.in b/bus/Makefile.in
index 3526ae85..b334af5a 100644
--- a/bus/Makefile.in
+++ b/bus/Makefile.in
@@ -36,15 +36,19 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = $(am__EXEEXT_3) $(am__EXEEXT_4)
+noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
 dbus_daemon_exec_PROGRAMS = dbus-daemon$(EXEEXT)
 @DBUS_UNIX_TRUE@libexec_PROGRAMS = dbus-daemon-launch-helper$(EXEEXT)
-TESTS = $(am__EXEEXT_1) $(am__EXEEXT_2)
+
+# run as a test by test/Makefile.am
 @DBUS_BUILD_TESTS_TRUE@am__append_1 = bus-test bus-test-system
-@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@am__append_2 = bus-test-launch-helper
+
+# run as a test by test/Makefile.am
 # this is used by the tests but is not,itself, a test
-@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@am__append_3 = dbus-daemon-launch-helper-test
-@HAVE_SYSTEMD_TRUE@am__append_4 = \
+@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@am__append_2 =  \
+@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@	bus-test-launch-helper \
+@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@	dbus-daemon-launch-helper-test
+@HAVE_SYSTEMD_TRUE@am__append_3 = \
 @HAVE_SYSTEMD_TRUE@	dbus.service.in \
 @HAVE_SYSTEMD_TRUE@	dbus.socket.in
 
@@ -77,9 +81,8 @@ am__installdirs = "$(DESTDIR)$(dbus_daemon_execdir)" \
 	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(systemdsystemunitdir)"
 @DBUS_BUILD_TESTS_TRUE@am__EXEEXT_1 = bus-test$(EXEEXT) \
 @DBUS_BUILD_TESTS_TRUE@	bus-test-system$(EXEEXT)
-@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@am__EXEEXT_2 = bus-test-launch-helper$(EXEEXT)
-am__EXEEXT_3 = $(am__EXEEXT_1) $(am__EXEEXT_2)
-@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@am__EXEEXT_4 = dbus-daemon-launch-helper-test$(EXEEXT)
+@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@am__EXEEXT_2 = bus-test-launch-helper$(EXEEXT) \
+@DBUS_BUILD_TESTS_TRUE@@DBUS_UNIX_TRUE@	dbus-daemon-launch-helper-test$(EXEEXT)
 PROGRAMS = $(dbus_daemon_exec_PROGRAMS) $(libexec_PROGRAMS) \
 	$(noinst_PROGRAMS)
 am__bus_test_SOURCES_DIST = activation.c activation.h \
@@ -306,8 +309,6 @@ DIST_SOURCES = $(am__bus_test_SOURCES_DIST) \
 DATA = $(agent_DATA) $(config_DATA) $(systemdsystemunit_DATA)
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -632,7 +633,6 @@ bus_test_launch_helper_CPPFLAGS = -DDBUS_STATIC_BUILD	\
 	-DACTIVATION_LAUNCHER_TEST	\
 	-DACTIVATION_LAUNCHER_DO_OOM
 
-@DBUS_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus DBUS_FATAL_WARNINGS=1 DBUS_BLOCK_ON_ABORT=1
 bus_test_system_SOURCES = \
 	$(XML_SOURCES)				\
 	config-parser-common.c			\
@@ -656,7 +656,7 @@ bus_test_LDFLAGS = @R_DYNAMIC_LDFLAG@
 
 #### Init scripts fun
 SCRIPT_IN_FILES = messagebus.in messagebus-config.in rc.messagebus.in \
-	$(am__append_4)
+	$(am__append_3)
 @DBUS_INIT_SCRIPTS_RED_HAT_TRUE@initddir = $(sysconfdir)/rc.d/init.d
 @DBUS_INIT_SCRIPTS_SLACKWARE_TRUE@initddir = $(sysconfdir)/rc.d/
 @DBUS_INIT_SCRIPTS_RED_HAT_TRUE@initd_SCRIPTS = \
@@ -2314,98 +2314,6 @@ GTAGS:
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
-	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
-	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
-	  else \
-	    echo "$$red$$dashes"; \
-	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
-
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -2437,7 +2345,6 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
 installdirs:
@@ -2549,10 +2456,9 @@ uninstall-am: uninstall-agentDATA uninstall-binSCRIPTS \
 	uninstall-initdSCRIPTS uninstall-libexecPROGRAMS \
 	uninstall-systemdsystemunitDATA
 
-.MAKE: check-am install-am install-data-am install-exec-am \
-	install-strip
+.MAKE: install-am install-data-am install-exec-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
 	clean-dbus_daemon_execPROGRAMS clean-generic \
 	clean-libexecPROGRAMS clean-libtool clean-local \
 	clean-noinstPROGRAMS ctags distclean distclean-compile \