diff options
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/Makefile.am | 13 | ||||
| -rw-r--r-- | bus/dispatch.c | 10 |
2 files changed, 13 insertions, 10 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am index d3f650eb..391ea509 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -75,12 +75,14 @@ dbus_daemon_LDADD= \ $(DBUS_BUS_LIBS) \ $(top_builddir)/dbus/libdbus-convenience.la +dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ + ## note that TESTS has special meaning (stuff to use in make check) ## so if adding tests not to be run in make check, don't add them to ## TESTS if DBUS_BUILD_TESTS -TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus -TESTS=bus-test +TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus DBUS_FATAL_WARNINGS=1 DBUS_BLOCK_ON_ABORT=1 +TESTS=bus-test else TESTS= endif @@ -94,6 +96,7 @@ bus_test_SOURCES= \ test-main.c bus_test_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_BUS_LIBS) +bus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ ## mop up the gcov files clean-local: @@ -104,9 +107,9 @@ uninstall-hook: install-data-hook: if test '!' -d $(DESTDIR)$(DBUS_DAEMONDIR); then \ - $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ - chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ - fi + $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ + chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ + fi $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d diff --git a/bus/dispatch.c b/bus/dispatch.c index d8b6ffb4..d374f75a 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -1479,7 +1479,7 @@ check_hello_connection (BusContext *context) dbus_error_init (&error); - connection = dbus_connection_open ("debug-pipe:name=test-server", &error); + connection = dbus_connection_open_private ("debug-pipe:name=test-server", &error); if (connection == NULL) { _DBUS_ASSERT_ERROR_IS_SET (&error); @@ -3998,7 +3998,7 @@ bus_dispatch_test (const DBusString *test_data_dir) if (context == NULL) return FALSE; - foo = dbus_connection_open ("debug-pipe:name=test-server", &error); + foo = dbus_connection_open_private ("debug-pipe:name=test-server", &error); if (foo == NULL) _dbus_assert_not_reached ("could not alloc connection"); @@ -4016,7 +4016,7 @@ bus_dispatch_test (const DBusString *test_data_dir) if (!check_add_match_all (context, foo)) _dbus_assert_not_reached ("AddMatch message failed"); - bar = dbus_connection_open ("debug-pipe:name=test-server", &error); + bar = dbus_connection_open_private ("debug-pipe:name=test-server", &error); if (bar == NULL) _dbus_assert_not_reached ("could not alloc connection"); @@ -4031,7 +4031,7 @@ bus_dispatch_test (const DBusString *test_data_dir) if (!check_add_match_all (context, bar)) _dbus_assert_not_reached ("AddMatch message failed"); - baz = dbus_connection_open ("debug-pipe:name=test-server", &error); + baz = dbus_connection_open_private ("debug-pipe:name=test-server", &error); if (baz == NULL) _dbus_assert_not_reached ("could not alloc connection"); @@ -4125,7 +4125,7 @@ bus_dispatch_sha1_test (const DBusString *test_data_dir) if (context == NULL) return FALSE; - foo = dbus_connection_open ("debug-pipe:name=test-server", &error); + foo = dbus_connection_open_private ("debug-pipe:name=test-server", &error); if (foo == NULL) _dbus_assert_not_reached ("could not alloc connection"); |