Attachment 51140 Details for Bug 40711 – [07/14] Remove --with-socket-dir, use /tmp for its only use

[patch] [07/14] Remove --with-socket-dir, use /tmp for its only use

0007-Remove-with-socket-dir-use-tmp-for-its-only-use.patch (text/plain), 1.89 KB, created by Simon McVittie on 2011-09-13 08:49:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-09-13 08:49:47 UTC

Size: 1.89 KB

patch

obsolete

>From 4213fc054b14f5e0a9875438a18b4f75648997a0 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 20 Jun 2011 11:29:50 +0100
>Subject: [PATCH 07/14] 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.
>---
> configure.ac             |    9 ---------
> test/core/test-profile.c |    3 +--
> 2 files changed, 1 insertions(+), 11 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index c3e3f2f..42c45b5 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
>@@ -402,7 +394,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",
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 40711: 51134 | 51135 | 51136 | 51137 | 51138 | 51139 | 51140 | 51141 | 51142 | 51144 | 51145 | 51146 | 51147 | 51148 | 53106 | 53107 | 53108 | 70262 | 70263 | 70264

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.