Check that watches are removed, then invalidated, then unreffed

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

diff --git a/test/Makefile.am b/test/Makefile.am
index 8237fde..99740c9 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -78,20 +78,16 @@ testexec_PROGRAMS =
 
 installable_tests = \
        test-corrupt \
+       test-dbus-daemon \
        test-loopback \
+       test-marshal \
        test-relay \
        $(NULL)
 
-modular_tests = \
-       test-dbus-daemon
-
 installcheck_tests =
 installcheck_environment = \
        DBUS_TEST_DAEMON=$(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon$(EXEEXT) \
-       DBUS_TEST_DATA=@abs_top_builddir@/test/data \
-       DBUS_TEST_USE_INSTALLED=1 \
-       DBUS_TEST_SYSCONFDIR=$(sysconfdir) \
-       DESTDIR=$(DESTDIR)
+       DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir)
 
 TESTS_ENVIRONMENT = \
        DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \
@@ -125,25 +121,33 @@ test_dbus_daemon_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)
+
 if DBUS_ENABLE_MODULAR_TESTS
-noinst_PROGRAMS += $(modular_tests)
-TESTS += $(modular_tests)
 TESTS += $(installable_tests)
 installcheck_tests += $(installable_tests)
-installcheck_tests += $(modular_tests)
 
 if DBUS_ENABLE_INSTALLED_TESTS
   testexec_PROGRAMS += $(installable_tests)
 else !DBUS_ENABLE_INSTALLED_TESTS
-  testexec_PROGRAMS += $(installable_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) \