X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=test%2FMakefile.am;h=fd687cd71a899daf7b77aebdca66220c6d0d8cf7;hb=9875480ed476f3c8ff3c7bdc35430342c440633e;hp=5fb863576330824b5d87e4050b4954ad46eec255;hpb=75ef1d2ed45d8cd2855f1b3a100a61ea9cc853a3;p=platform%2Fupstream%2Fdbus.git diff --git a/test/Makefile.am b/test/Makefile.am index 5fb8635..fd687cd 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -4,32 +4,62 @@ SUBDIRS= . name-test DIST_SUBDIRS=name-test -INCLUDES=-I$(top_srcdir) $(DBUS_TEST_CFLAGS) +INCLUDES=-I$(top_srcdir) -libdbus_testutils_la_SOURCES = test-utils.h test-utils.c +# 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 ## most of these binaries are used in tests but are not themselves tests -TEST_BINARIES=test-service test-names test-shell-service shell-test spawn-test test-segfault test-exit test-sleep-forever +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 -else +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 + 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 @@ -58,29 +88,114 @@ test_segfault_SOURCES = \ test_sleep_forever_SOURCES = \ test-sleep-forever.c -decode_gcov_SOURCES= \ - decode-gcov.c - -# When any programs are not linked to libdbus-internal, fix this. -AM_CPPFLAGS=-DDBUS_STATIC_BUILD -TEST_LIBS=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS) - -test_service_LDADD=libdbus-testutils.la $(TEST_LIBS) -test_service_LDFLAGS=@R_DYNAMIC_LDFLAG@ -test_names_LDADD=libdbus-testutils.la $(TEST_LIBS) -test_names_LDFLAGS=@R_DYNAMIC_LDFLAG@ -## break_loader_LDADD= $(TEST_LIBS) -## break_loader_LDFLAGS=@R_DYNAMIC_LDFLAG@ -test_shell_service_LDADD=libdbus-testutils.la $(TEST_LIBS) -test_shell_service_LDFLAGS=@R_DYNAMIC_LDFLAG@ -shell_test_LDADD=libdbus-testutils.la $(TEST_LIBS) -shell_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ -spawn_test_LDADD=$(TEST_LIBS) -spawn_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ -decode_gcov_LDADD=$(TEST_LIBS) -decode_gcov_LDFLAGS=@R_DYNAMIC_LDFLAG@ - -EXTRA_DIST= +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) + +if DBUS_ENABLE_INSTALLED_TESTS + testexec_PROGRAMS += $(installable_tests) +else !DBUS_ENABLE_INSTALLED_TESTS + noinst_PROGRAMS += $(installable_tests) +endif !DBUS_ENABLE_INSTALLED_TESTS + +endif DBUS_ENABLE_MODULAR_TESTS + +# 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= \ @@ -115,8 +230,17 @@ dist-hook: done ; \ 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