From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 5 Oct 2010 21:31:40 +0000 (+0100)
Subject: Fix test failures on OSX.
X-Git-Tag: dbus-1.4.1~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=197bef8;p=thirdparty%2Fdbus.git

Fix test failures on OSX.
---

diff --git a/configure.in b/configure.in
index c60339877..98d570097 100644
--- a/configure.in
+++ b/configure.in
@@ -1543,6 +1543,8 @@ else
    DEFAULT_SOCKET_DIR=/tmp
 fi
 
+DEFAULT_SOCKET_DIR=`echo $DEFAULT_SOCKET_DIR | sed 's/+/%2B/g'`
+
 if ! test -z "$with_test_socket_dir" ; then
    TEST_SOCKET_DIR="$with_test_socket_dir"
 else
diff --git a/test/data/valid-config-files/many-rules.conf b/test/data/valid-config-files/many-rules.conf
index 0a15e83c1..68ba9d93e 100644
--- a/test/data/valid-config-files/many-rules.conf
+++ b/test/data/valid-config-files/many-rules.conf
@@ -17,7 +17,7 @@
     <deny send_destination="org.freedesktop.System"/>
     <deny receive_sender="org.freedesktop.System"/>
     <deny user="root"/>
-    <deny group="root"/>
+    <deny group="wheel"/>
     <allow send_type="error"/>
     <allow send_type="method_call"/>
     <allow send_type="method_return"/>
@@ -35,7 +35,7 @@
     <deny send_destination="org.freedesktop.System"/>
     <deny receive_sender="org.freedesktop.System"/>
     <deny user="root"/>
-    <deny group="root"/>
+    <deny group="wheel"/>
     <allow send_type="error"/>
     <allow send_type="method_call"/>
     <allow send_type="method_return"/>