From 82c724ab629d7aaea7f7461c375407ac41c0c09a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 20 Jun 2011 11:29:50 +0100 Subject: Remove --with-socket-dir, use /tmp for its only use test-profile.c is not run by default anyway, and it hard-codes the use of Unix sockets which isn't portable off Unix. If you have Unix sockets but not /tmp, then your platform has worse problems than inability to run all dbus-glib tests. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711 Reviewed-by: Dan Williams --- configure.ac | 9 --------- test/core/test-profile.c | 3 +-- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index eb68dbd..f27a407 100644 --- a/configure.ac +++ b/configure.ac @@ -352,14 +352,6 @@ AC_SUBST(DBUS_GLIB_TOOL_LIBS) ### gtk-doc Documentation GTK_DOC_CHECK(1.4) -if ! test -z "$with_test_socket_dir" ; then - TEST_SOCKET_DIR="$with_test_socket_dir" -else - TEST_SOCKET_DIR=$DEFAULT_SOCKET_DIR -fi -AC_SUBST(TEST_SOCKET_DIR) -AC_DEFINE_UNQUOTED(DBUS_TEST_SOCKET_DIR, "$TEST_SOCKET_DIR", [Where to put test sockets]) - AC_OUTPUT([ Makefile m4/Makefile @@ -404,7 +396,6 @@ echo " Building Gtk-doc docs: ${enable_gtk_doc} Bash Completion: ${enable_bash_completion} Using XML parser: ${with_xml} - 'make check' socket dir: ${TEST_SOCKET_DIR} " if test x$enable_tests = xyes; then diff --git a/test/core/test-profile.c b/test/core/test-profile.c index 42194d6..b5fd2c9 100644 --- a/test/core/test-profile.c +++ b/test/core/test-profile.c @@ -289,8 +289,7 @@ no_bus_init_server (ServerData *sd) DBusError error; dbus_error_init (&error); - server = dbus_server_listen ("unix:tmpdir="DBUS_TEST_SOCKET_DIR, - &error); + server = dbus_server_listen ("unix:tmpdir=/tmp", &error); if (server == NULL) { g_printerr ("Could not start server: %s\n", -- cgit v1.2.1