Merge branch 'dbus-1.4'

[platform/upstream/dbus.git] / test / Makefile.am

diff --git a/test/Makefile.am b/test/Makefile.am
index d537321..187a239 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -30,6 +30,19 @@ 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=
@@ -93,6 +106,7 @@ testexec_PROGRAMS =
 installable_tests = \
        test-corrupt \
        test-dbus-daemon \
+       test-dbus-daemon-eavesdrop \
        test-loopback \
        test-marshal \
        test-relay \
@@ -104,8 +118,12 @@ installcheck_environment = \
        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_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)
@@ -135,6 +153,13 @@ 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_LDFLAGS = @R_DYNAMIC_LDFLAG@