diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-20 11:29:50 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-11-19 15:34:34 +0000 |
| commit | 82c724ab629d7aaea7f7461c375407ac41c0c09a (patch) | |
| tree | 6fdf1d682635dc641626dcd540c479cae54ff067 | |
| parent | 61081c7ed819a844e26837688347182721922d57 (diff) | |
| download | dbus-glib-82c724ab629d7aaea7f7461c375407ac41c0c09a.tar.gz | |
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 <dcbw@redhat.com>
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | test/core/test-profile.c | 3 |
2 files changed, 1 insertions, 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", |