refs test: fix unused variable
[platform/upstream/dbus.git] / test / Makefile.am
index d537321..d69e783 100644 (file)
@@ -4,9 +4,29 @@
 SUBDIRS= . name-test 
 DIST_SUBDIRS=name-test
 
-INCLUDES=-I$(top_srcdir) $(DBUS_TEST_CFLAGS) 
+AM_CPPFLAGS = \
+       -I$(top_srcdir) \
+       $(GLIB_CFLAGS) \
+       $(DBUS_GLIB_CFLAGS) \
+       $(NULL)
+
+# improve backtraces from test stuff
+AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
+
+static_cppflags = \
+       $(AM_CPPFLAGS) \
+       -DDBUS_STATIC_BUILD \
+       $(NULL)
 
-libdbus_testutils_la_SOURCES = test-utils.h test-utils.c
+libdbus_testutils_la_CPPFLAGS = \
+       $(static_cppflags)
+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
 
@@ -30,6 +50,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=
@@ -39,50 +72,26 @@ endif !DBUS_BUILD_TESTS
 
 noinst_PROGRAMS= $(TEST_BINARIES)
 
-test_service_SOURCES=                          \
-       test-service.c
-
-test_names_SOURCES=                            \
-       test-names.c
-
-##break_loader_SOURCES=                                \
-##     break-loader.c
-
-test_shell_service_SOURCES =                   \
-       test-shell-service.c
-
-shell_test_SOURCES=                             \
-        shell-test.c
-
-spawn_test_SOURCES=                            \
-       spawn-test.c
-
-test_exit_SOURCES =                            \
-       test-exit.c
-
-test_segfault_SOURCES =                                \
-       test-segfault.c
-
-test_sleep_forever_SOURCES =                   \
-       test-sleep-forever.c
-
-# This assumes that most tests will be linked to libdbus-internal;
-# tests linked to only the public libdbus have their own CPPFLAGS.
-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@
+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
+
+test_refs_SOURCES = internals/refs.c
+test_refs_CPPFLAGS = $(static_cppflags)
+test_refs_LDADD = libdbus-testutils.la $(GLIB_LIBS)
+
+test_syslog_SOURCES = internals/syslog.c
+test_syslog_CPPFLAGS = $(static_cppflags)
+test_syslog_LDADD = libdbus-testutils.la $(GLIB_LIBS)
 
 EXTRA_DIST = dbus-test-runner
 
@@ -93,9 +102,12 @@ testexec_PROGRAMS =
 installable_tests = \
        test-corrupt \
        test-dbus-daemon \
+       test-dbus-daemon-eavesdrop \
        test-loopback \
        test-marshal \
+       test-refs \
        test-relay \
+       test-syslog \
        $(NULL)
 
 installcheck_tests =
@@ -104,40 +116,41 @@ 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)
-test_corrupt_LDFLAGS = @R_DYNAMIC_LDFLAG@
 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_LDFLAGS = @R_DYNAMIC_LDFLAG@
 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_LDFLAGS = @R_DYNAMIC_LDFLAG@
 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_LDFLAGS = @R_DYNAMIC_LDFLAG@
 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@
 test_marshal_LDADD = $(top_builddir)/dbus/libdbus-1.la \
     $(GLIB_LIBS) \
     $(DBUS_GLIB_LIBS)
@@ -250,6 +263,8 @@ clean-local:
                        REVERSEDIRS="$$D $$REVERSEDIRS" ;               \
                done ;                                                  \
                for D in $$REVERSEDIRS; do                              \
-                       rmdir $(top_builddir)/test/$$D || exit 1 ;      \
+                       rmdir $(top_builddir)/test/$$D ||               \
+                               test ! -d $(top_builddir)/test/$$D ||   \
+                               exit 1 ;        \
                done ;                                                  \
        fi