X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=test%2FMakefile.am;h=fd687cd71a899daf7b77aebdca66220c6d0d8cf7;hb=9875480ed476f3c8ff3c7bdc35430342c440633e;hp=b4863c7a184b2e44547338ec14d1fa7a3a0d678c;hpb=a929c9a3b465db8b7e17b9b39936c612c2621a7c;p=platform%2Fupstream%2Fdbus.git

diff --git a/test/Makefile.am b/test/Makefile.am
index b4863c7..fd687cd 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,45 +1,77 @@
-SUBDIRS=name-test 
+## the "name-test" subdir in fact contains a bunch of tests now that need a temporary bus 
+## to be running to do stuff with. The directory should be renamed.
+## We want to build the current directory first to pick up the testutils lib
+SUBDIRS= . name-test 
 DIST_SUBDIRS=name-test
 
-INCLUDES=-I$(top_srcdir) $(DBUS_TEST_CFLAGS) 
+INCLUDES=-I$(top_srcdir)
 
+# improve backtraces from test stuff
+AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
+
+libdbus_testutils_la_SOURCES = \
+	test-utils.c \
+	test-utils.h \
+	$(NULL)
+libdbus_testutils_la_LIBADD = \
+	$(top_builddir)/dbus/libdbus-internal.la \
+	$(NULL)
+
+noinst_LTLIBRARIES = libdbus-testutils.la
 
 if DBUS_BUILD_TESTS
 ## break-loader removed for now
-TEST_BINARIES=test-service test-names test-shell-service shell-test spawn-test test-segfault test-exit test-sleep-forever
+## most of these binaries are used in tests but are not themselves tests
+TEST_BINARIES = \
+	shell-test \
+	spawn-test \
+	test-exit \
+	test-names \
+	test-segfault \
+	test-service \
+	test-shell-service \
+	test-sleep-forever \
+	$(NULL)
+
+## these are the things to run in make check (i.e. they are actual tests)
+## (binaries in here must also be in TEST_BINARIES)
+TESTS = \
+	shell-test \
+	$(NULL)
+
+## These are conceptually part of directories that come earlier in SUBDIRS
+## order, but we don't want to run them til we arrive in this directory,
+## since they depend on stuff from this directory
+TESTS += \
+	../bus/bus-test$(EXEEXT) \
+	../bus/bus-test-system$(EXEEXT) \
+	../dbus/dbus-test$(EXEEXT) \
+	$(NULL)
+
+if DBUS_UNIX
+TESTS += ../bus/bus-test-launch-helper$(EXEEXT)
+endif
+
+else !DBUS_BUILD_TESTS
 
-#enable stand alone make check test
-TESTS=shell-test
-else
 TEST_BINARIES=
 TESTS=
-endif
 
-if DBUS_GCOV_ENABLED
-GCOV_BINARIES=decode-gcov
-else
-GCOV_BINARIES=
-endif
+endif !DBUS_BUILD_TESTS
 
-noinst_PROGRAMS= $(TEST_BINARIES) $(GCOV_BINARIES)
+noinst_PROGRAMS= $(TEST_BINARIES)
 
 test_service_SOURCES=				\
-	test-service.c				\
-	test-utils.c				\
-	test-utils.h
+	test-service.c
 
 test_names_SOURCES=				\
-	test-names.c				\
-	test-utils.c				\
-	test-utils.h
+	test-names.c
 
 ##break_loader_SOURCES=				\
 ##	break-loader.c
 
 test_shell_service_SOURCES =			\
-	test-shell-service.c			\
-	test-utils.c				\
-	test-utils.h
+	test-shell-service.c
 
 shell_test_SOURCES=                             \
         shell-test.c
@@ -56,20 +88,114 @@ test_segfault_SOURCES =				\
 test_sleep_forever_SOURCES =			\
 	test-sleep-forever.c
 
-decode_gcov_SOURCES=				\
-	decode-gcov.c
+static_cppflags = \
+	$(AM_CPPFLAGS) \
+	-DDBUS_STATIC_BUILD \
+	$(NULL)
+
+test_service_CPPFLAGS = $(static_cppflags)
+test_service_LDADD = libdbus-testutils.la
+test_names_CPPFLAGS = $(static_cppflags)
+test_names_LDADD = libdbus-testutils.la
+## break_loader_CPPFLAGS = $(static_cppflags)
+## break_loader_LDADD = $(top_builddir)/dbus/libdbus-internal.la
+test_shell_service_CPPFLAGS = $(static_cppflags)
+test_shell_service_LDADD = libdbus-testutils.la
+shell_test_CPPFLAGS = $(static_cppflags)
+shell_test_LDADD = libdbus-testutils.la
+spawn_test_CPPFLAGS = $(static_cppflags)
+spawn_test_LDADD = $(top_builddir)/dbus/libdbus-internal.la
+
+EXTRA_DIST = dbus-test-runner
+
+testexecdir = $(libdir)/dbus-1.0/test
+
+testexec_PROGRAMS =
+
+installable_tests = \
+	test-corrupt \
+	test-dbus-daemon \
+	test-dbus-daemon-eavesdrop \
+	test-loopback \
+	test-marshal \
+	test-relay \
+	$(NULL)
+
+installcheck_tests =
+installcheck_environment = \
+	DBUS_TEST_DAEMON=$(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon$(EXEEXT) \
+	DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir)
+
+TESTS_ENVIRONMENT = \
+	DBUS_BLOCK_ON_ABORT=1 \
+	DBUS_FATAL_WARNINGS=1 \
+	DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \
+	DBUS_TEST_DATA=@abs_top_builddir@/test/data \
+	DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \
+	$(NULL)
+
+test_corrupt_SOURCES = corrupt.c
+test_corrupt_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
+test_corrupt_LDADD = $(top_builddir)/dbus/libdbus-1.la \
+    $(GLIB_LIBS) \
+    $(DBUS_GLIB_LIBS)
+
+test_loopback_SOURCES = loopback.c
+test_loopback_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
+test_loopback_LDADD = $(top_builddir)/dbus/libdbus-1.la \
+    $(GLIB_LIBS) \
+    $(DBUS_GLIB_LIBS)
+
+test_relay_SOURCES = relay.c
+test_relay_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
+test_relay_LDADD = $(top_builddir)/dbus/libdbus-1.la \
+    $(GLIB_LIBS) \
+    $(DBUS_GLIB_LIBS)
+
+test_dbus_daemon_SOURCES = dbus-daemon.c
+test_dbus_daemon_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
+test_dbus_daemon_LDADD = $(top_builddir)/dbus/libdbus-1.la \
+    $(GLIB_LIBS) \
+    $(DBUS_GLIB_LIBS)
+
+test_dbus_daemon_eavesdrop_SOURCES = dbus-daemon-eavesdrop.c
+test_dbus_daemon_eavesdrop_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
+test_dbus_daemon_eavesdrop_LDFLAGS = @R_DYNAMIC_LDFLAG@
+test_dbus_daemon_eavesdrop_LDADD = $(top_builddir)/dbus/libdbus-1.la \
+    $(GLIB_LIBS) \
+    $(DBUS_GLIB_LIBS)
+
+test_marshal_SOURCES = marshal.c
+test_marshal_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
+test_marshal_LDADD = $(top_builddir)/dbus/libdbus-1.la \
+    $(GLIB_LIBS) \
+    $(DBUS_GLIB_LIBS)
+
+if DBUS_ENABLE_MODULAR_TESTS
+TESTS += $(installable_tests)
+installcheck_tests += $(installable_tests)
 
-TEST_LIBS=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la
+if DBUS_ENABLE_INSTALLED_TESTS
+  testexec_PROGRAMS += $(installable_tests)
+else !DBUS_ENABLE_INSTALLED_TESTS
+  noinst_PROGRAMS += $(installable_tests)
+endif !DBUS_ENABLE_INSTALLED_TESTS
 
-test_service_LDADD=$(TEST_LIBS)
-test_names_LDADD=$(TEST_LIBS)
-## break_loader_LDADD= $(TEST_LIBS)
-test_shell_service_LDADD=$(TEST_LIBS)
-shell_test_LDADD=$(TEST_LIBS)
-spawn_test_LDADD=$(TEST_LIBS)
-decode_gcov_LDADD=$(TEST_LIBS)
+endif DBUS_ENABLE_MODULAR_TESTS
 
-EXTRA_DIST=
+# If we're installing the tests into a DESTDIR we can't run them
+# again using the installed copy, because we don't know how to
+# do a portable equivalent of setting LD_LIBRARY_PATH.
+installcheck-local:
+	$(MAKE) check-TESTS TESTS='$$(installcheck_tests)' \
+		TESTS_ENVIRONMENT='$$(installcheck_environment)'
+if DBUS_ENABLE_INSTALLED_TESTS
+	test -n "$(DESTDIR)" || \
+	$(installcheck_environment) \
+		$(srcdir)/dbus-test-runner \
+		$(testexecdir) \
+		$(testexec_PROGRAMS)
+endif DBUS_ENABLE_INSTALLED_TESTS
 
 ## keep these in creation order, i.e. uppermost dirs first 
 TESTDIRS=					\
@@ -80,10 +206,15 @@ TESTDIRS=					\
 	data/auth				\
 	data/sha-1				\
 	data/valid-config-files			\
+	data/valid-config-files-system		\
 	data/valid-config-files/basic.d		\
+	data/valid-config-files/session.d	\
 	data/valid-config-files/system.d	\
 	data/valid-service-files		\
+	data/valid-service-files-system		\
+	data/invalid-service-files-system	\
 	data/invalid-config-files		\
+	data/invalid-config-files-system	\
 	data/equiv-config-files			\
 	data/equiv-config-files/basic		\
 	data/equiv-config-files/basic/basic.d	\
@@ -91,26 +222,35 @@ TESTDIRS=					\
 	data/equiv-config-files/entities/basic.d
 
 
-FIND_TESTS=find -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service"
+FIND_TESTS=find . -type f -a \( -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service" \)
 
 dist-hook:
 	for D in $(TESTDIRS); do						\
 		test -d $(distdir)/$$D || mkdir $(distdir)/$$D || exit 1 ;	\
 	done ;									\
-	FILES=`(cd $(srcdir) && $(FIND_TESTS) -o -name "*.in" -a -not -name Makefile.in)` ;					\
+	FILES=`(cd $(srcdir) && $(FIND_TESTS) -o -name "*.in" -a -not -name Makefile.in | grep -Ev "(.svn|CVS)" )` ;					\
         for F in $$FILES; do							\
-                echo '-- Disting file '$$F ;					\
-		cp -f $(srcdir)/$$F $(distdir)/$$F || exit 1 ;				\
+		B=`basename $$F`; \
+		if test -e $$F.in; then \
+			echo "-- Skipping file $$F (.in version exists)"; \
+		elif test "x$$B" = xrun-with-tmp-session-bus.conf; then \
+			echo "-- Skipping file $$F (generated)"; \
+		elif test -e "$(top_srcdir)/bus/$$B"; then \
+			echo "-- Skipping file $$F (from /bus/)"; \
+		else \
+			echo '-- Disting file '$$F ; \
+			cp -f $(srcdir)/$$F $(distdir)/$$F || exit 1; \
+		fi; \
 	done
 
 ## copy tests to builddir so that generated tests and static tests 
 ## are all in one place.
 all-local:
-	for D in $(TESTDIRS); do								\
+	$(AM_V_at)for D in $(TESTDIRS); do								\
 		test -d $(top_builddir)/test/$$D || mkdir $(top_builddir)/test/$$D || exit 1 ;	\
 	done ;											\
 	if ! (test $(srcdir) = . || test $(srcdir) -ef .) ; then								\
-		FILES=`(cd $(srcdir) && $(FIND_TESTS))` ;					\
+		FILES=`(cd $(srcdir) && $(FIND_TESTS) | grep -Ev "(.svn|CVS)" )` ;					\
 	        for F in $$FILES; do								\
 			SRC=$(srcdir)/$$F ;							\
 			DEST=$(top_builddir)/test/$$F ;						\
@@ -128,7 +268,7 @@ all-local:
 ## this doesn't clean generated test data files when srcdir=builddir
 clean-local:
 	if test $(srcdir) != . ; then					\
-		FILES=`(cd $(top_builddir)/test && $(FIND_TESTS))` ;	\
+		FILES=`(cd $(top_builddir)/test && $(FIND_TESTS) | grep -Ev "(.svn|CVS)" )` ;	\
 	        for F in $$FILES; do					\
 			DEST=$(top_builddir)/test/$$F ;			\
 	                echo '-- Deleting test file '$$F ;		\