Attachment 51636 Details for Bug 41222 – [4/5] Merge tests' cmake and autotools bus configuration

[patch] [4/5] Merge tests' cmake and autotools bus configuration

0004-Merge-tests-cmake-and-autotools-bus-configuration.patch (text/plain), 15.29 KB, created by Simon McVittie on 2011-09-26 09:58:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-09-26 09:58:27 UTC

Size: 15.29 KB

patch

obsolete

>From 722f26d2d6b0ab1bb28575850cd73595d6bc2699 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 26 Sep 2011 17:37:20 +0100
>Subject: [PATCH 4/5] Merge tests' cmake and autotools bus configuration
>
>In Unix, the tests listened on both debug-pipe (which is a socketpair,
>or a TCP emulation of socketpair on Windows) and a Unix socket.
>
>In the Windows port, the tests were hard-coded to listen on a particular
>port, which allowed the dispatch test to connect to that port, as long
>as no two tests ran simultaneously (which I don't think was ever guaranteed -
>make -j can violate this). That's valid out-of-process, and also
>fully-specified, so they only needed one <listen> directive, so the
>CMake input only had one.
>
>To make the tests work under CMake on Unix, there was a hack: the string
>substituted for the content of the <listen> directive contained
></listen><listen> to get the other address in, which is pretty nasty.
>
>Instead of doing that, I've made both build systems, on both Unix and
>Windows, use both debug-pipe and a more normal transport (Unix or TCP).
>debug-pipe has a Windows implementation and it's used in
>dbus-spawn-win.c, so it'd better work. The use of debug-pipe is now
>hard-coded rather than being a configure parameter (there's no reason
>to vary it in different builds), and I used TEST_LISTEN as the name of the
>Unix/TCP address, because it's a "vague" address (no specific Unix path, no
>TCP port), that you can listen on but not connect to.
>
>This in turn means that we can merge the Autoconf .in and CMake .cmake
>files, similar to Bug #41033.
>
>You might wonder why I've kept debug-pipe. I did try to get rid of it, but
>it turns out that the tests in dispatch.c rely on
>dbus_connection_open_private() not blocking, and normal socket
>connections block on connect(). Until we fix that by adding an async
>version of dbus_connection_open_private(), it won't be safe to have a
>test like dispatch.c that "talks to itself", unless it uses a transport
>as trivial as debug-pipe in which neither end has to block on the other.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> bus/dispatch.c                                     |   31 +++++++------------
> cmake/CMakeLists.txt                               |    6 +--
> cmake/config.h.cmake                               |    1 -
> cmake/test/CMakeLists.txt                          |    4 --
> configure.ac                                       |    9 ++++++
> .../debug-allow-all-fail.conf.cmake                |   16 ----------
> .../debug-allow-all-fail.conf.in                   |    2 +-
> .../debug-allow-all-pass.conf.cmake                |   16 ----------
> .../debug-allow-all-pass.conf.in                   |    2 +-
> .../debug-allow-all-sha1.conf.cmake                |   15 ---------
> .../debug-allow-all-sha1.conf.in                   |    2 +-
> .../valid-config-files/debug-allow-all.conf.cmake  |   14 ---------
> .../valid-config-files/debug-allow-all.conf.in     |    2 +-
> 13 files changed, 27 insertions(+), 93 deletions(-)
> delete mode 100644 test/data/valid-config-files-system/debug-allow-all-fail.conf.cmake
> delete mode 100644 test/data/valid-config-files-system/debug-allow-all-pass.conf.cmake
> delete mode 100644 test/data/valid-config-files/debug-allow-all-sha1.conf.cmake
> delete mode 100644 test/data/valid-config-files/debug-allow-all.conf.cmake
>
>diff --git a/bus/dispatch.c b/bus/dispatch.c
>index a80476c..c11b061 100644
>--- a/bus/dispatch.c
>+++ b/bus/dispatch.c
>@@ -41,17 +41,10 @@
> #include <unistd.h>
> #endif
> 
>-#ifndef TEST_CONNECTION
>-/*
>- TODO autotools:
>-  move to build system as already done for cmake
>-*/
>-#ifdef DBUS_UNIX
>-#define TEST_CONNECTION "debug-pipe:name=test-server"
>-#else
>-#define TEST_CONNECTION "tcp:host=localhost,port=1234"
>-#endif
>-#endif
>+/* This is hard-coded in the files in valid-config-files-*. We have to use
>+ * the debug-pipe transport because the tests in this file require that
>+ * dbus_connection_open_private() does not block. */
>+#define TEST_DEBUG_PIPE "debug-pipe:name=test-server"
> 
> static dbus_bool_t
> send_one_message (DBusConnection *connection,
>@@ -1532,7 +1525,7 @@ check_hello_connection (BusContext *context)
> 
>   dbus_error_init (&error);
> 
>-  connection = dbus_connection_open_private (TEST_CONNECTION, &error);
>+  connection = dbus_connection_open_private (TEST_DEBUG_PIPE, &error);
>   if (connection == NULL)
>     {
>       _DBUS_ASSERT_ERROR_IS_SET (&error);
>@@ -4501,7 +4494,7 @@ bus_dispatch_test_conf (const DBusString *test_data_dir,
>   if (context == NULL)
>     return FALSE;
> 
>-  foo = dbus_connection_open_private (TEST_CONNECTION, &error);
>+  foo = dbus_connection_open_private (TEST_DEBUG_PIPE, &error);
>   if (foo == NULL)
>     _dbus_assert_not_reached ("could not alloc connection");
> 
>@@ -4519,7 +4512,7 @@ bus_dispatch_test_conf (const DBusString *test_data_dir,
>   if (!check_add_match_all (context, foo))
>     _dbus_assert_not_reached ("AddMatch message failed");
> 
>-  bar = dbus_connection_open_private (TEST_CONNECTION, &error);
>+  bar = dbus_connection_open_private (TEST_DEBUG_PIPE, &error);
>   if (bar == NULL)
>     _dbus_assert_not_reached ("could not alloc connection");
> 
>@@ -4534,7 +4527,7 @@ bus_dispatch_test_conf (const DBusString *test_data_dir,
>   if (!check_add_match_all (context, bar))
>     _dbus_assert_not_reached ("AddMatch message failed");
> 
>-  baz = dbus_connection_open_private (TEST_CONNECTION, &error);
>+  baz = dbus_connection_open_private (TEST_DEBUG_PIPE, &error);
>   if (baz == NULL)
>     _dbus_assert_not_reached ("could not alloc connection");
> 
>@@ -4650,7 +4643,7 @@ bus_dispatch_test_conf_fail (const DBusString *test_data_dir,
>   if (context == NULL)
>     return FALSE;
> 
>-  foo = dbus_connection_open_private (TEST_CONNECTION, &error);
>+  foo = dbus_connection_open_private (TEST_DEBUG_PIPE, &error);
>   if (foo == NULL)
>     _dbus_assert_not_reached ("could not alloc connection");
> 
>@@ -4733,7 +4726,7 @@ bus_dispatch_sha1_test (const DBusString *test_data_dir)
>   if (context == NULL)
>     return FALSE;
> 
>-  foo = dbus_connection_open_private (TEST_CONNECTION, &error);
>+  foo = dbus_connection_open_private (TEST_DEBUG_PIPE, &error);
>   if (foo == NULL)
>     _dbus_assert_not_reached ("could not alloc connection");
> 
>@@ -4783,7 +4776,7 @@ bus_unix_fds_passing_test(const DBusString *test_data_dir)
>   if (context == NULL)
>     _dbus_assert_not_reached ("could not alloc context");
> 
>-  foo = dbus_connection_open_private (TEST_CONNECTION, &error);
>+  foo = dbus_connection_open_private (TEST_DEBUG_PIPE, &error);
>   if (foo == NULL)
>     _dbus_assert_not_reached ("could not alloc connection");
> 
>@@ -4798,7 +4791,7 @@ bus_unix_fds_passing_test(const DBusString *test_data_dir)
>   if (!check_add_match_all (context, foo))
>     _dbus_assert_not_reached ("AddMatch message failed");
> 
>-  bar = dbus_connection_open_private (TEST_CONNECTION, &error);
>+  bar = dbus_connection_open_private (TEST_DEBUG_PIPE, &error);
>   if (bar == NULL)
>     _dbus_assert_not_reached ("could not alloc connection");
> 
>diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
>index 53cc343..8a93f71 100644
>--- a/cmake/CMakeLists.txt
>+++ b/cmake/CMakeLists.txt
>@@ -479,12 +479,10 @@ if (DBUS_BUILD_TESTS)
>     set(TEST_SOCKET_DIR ${DBUS_SESSION_SOCKET_DIR} )
>     set(TEST_LAUNCH_HELPER_BINARY ${EXECUTABLE_OUTPUT_PATH}/dbus-daemon-launch-helper-test)
>     if (UNIX)
>-        set (TEST_LISTEN "debug-pipe:name=test-server</listen><listen>unix:tmpdir=${TEST_SOCKET_DIR}")
>-        set (TEST_CONNECTION "debug-pipe:name=test-server")
>+        set (TEST_LISTEN "unix:tmpdir=${TEST_SOCKET_DIR}")
>     endif (UNIX)
>     if (WIN32)
>-        set (TEST_LISTEN "tcp:host=localhost,port=12436")
>-        set (TEST_CONNECTION "${TEST_LISTEN}")
>+        set (TEST_LISTEN "tcp:host=localhost")
>     endif (WIN32)
> endif  (DBUS_BUILD_TESTS)
> 
>diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
>index 768bf2d..6221c19 100644
>--- a/cmake/config.h.cmake
>+++ b/cmake/config.h.cmake
>@@ -30,7 +30,6 @@
> #define VERSION DBUS_VERSION_STRING
> 
> #define TEST_LISTEN       "@TEST_LISTEN@"
>-#define TEST_CONNECTION   "@TEST_CONNECTION@"
> 
> // test binaries
> #define DBUS_TEST_EXEC "@DBUS_TEST_EXEC@"
>diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
>index 9a259d2..dd50044 100644
>--- a/cmake/test/CMakeLists.txt
>+++ b/cmake/test/CMakeLists.txt
>@@ -134,10 +134,6 @@ FOREACH(FILE_TYPE *.conf.in *.service.in)
>       GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME)
>       STRING(REGEX REPLACE "\\.in$" "" FILENAME ${FILENAME})
>       SET (TARGET ${CMAKE_BINARY_DIR}/${DIR}/${FILENAME})
>-      STRING(REGEX REPLACE "\\.in$" ".cmake" _file ${FILE})
>-      IF (EXISTS ${_file})
>-        SET (FILE ${_file})
>-      ENDIF (EXISTS ${_file})
>       configure_file(${FILE} ${TARGET} @ONLY IMMEDIATE)
>       IF (CONFIG_VERBOSE)
>         MESSAGE("${FILE}")
>diff --git a/configure.ac b/configure.ac
>index 02be0f9..0e11a86 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -1529,6 +1529,15 @@ fi
> AC_SUBST(TEST_SOCKET_DIR)
> AC_DEFINE_UNQUOTED(DBUS_TEST_SOCKET_DIR, "$TEST_SOCKET_DIR", [Where to put test sockets])
> 
>+if test "x$dbus_unix" = xyes; then
>+  TEST_LISTEN="unix:tmpdir=$TEST_SOCKET_DIR"
>+else
>+  TEST_LISTEN="tcp:host=localhost"
>+fi
>+AC_SUBST([TEST_LISTEN])
>+AC_DEFINE_UNQUOTED([TEST_LISTEN], ["$TEST_LISTEN"],
>+  [Listening address for regression tests])
>+
> if ! test -z "$with_session_socket_dir" ; then
>    DBUS_SESSION_SOCKET_DIR="$with_session_socket_dir"
> else
>diff --git a/test/data/valid-config-files-system/debug-allow-all-fail.conf.cmake b/test/data/valid-config-files-system/debug-allow-all-fail.conf.cmake
>deleted file mode 100644
>index 854bfe9..0000000
>--- a/test/data/valid-config-files-system/debug-allow-all-fail.conf.cmake
>+++ /dev/null
>@@ -1,16 +0,0 @@
>-
>-
>-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
>- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
>-<busconfig>
>-  <listen>@TEST_LISTEN@</listen>
>-  <type>system</type>
>-  <servicehelper>@TEST_LAUNCH_HELPER_BINARY@</servicehelper>
>-  <servicedir>@DBUS_TEST_DATA@/invalid-service-files-system</servicedir>
>-  <policy context="default">
>-    <allow send_interface="*"/>
>-    <allow receive_interface="*"/>
>-    <allow own="*"/>
>-    <allow user="*"/>
>-  </policy>
>-</busconfig>
>diff --git a/test/data/valid-config-files-system/debug-allow-all-fail.conf.in b/test/data/valid-config-files-system/debug-allow-all-fail.conf.in
>index a61244b..bab178f 100644
>--- a/test/data/valid-config-files-system/debug-allow-all-fail.conf.in
>+++ b/test/data/valid-config-files-system/debug-allow-all-fail.conf.in
>@@ -4,7 +4,7 @@
>  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
> <busconfig>
>   <listen>debug-pipe:name=test-server</listen>
>-  <listen>unix:tmpdir=@TEST_SOCKET_DIR@</listen>
>+  <listen>@TEST_LISTEN@</listen>
>   <type>system</type>
>   <servicehelper>@TEST_LAUNCH_HELPER_BINARY@</servicehelper>
>   <servicedir>@DBUS_TEST_DATA@/invalid-service-files-system</servicedir>
>diff --git a/test/data/valid-config-files-system/debug-allow-all-pass.conf.cmake b/test/data/valid-config-files-system/debug-allow-all-pass.conf.cmake
>deleted file mode 100644
>index 1ac5c20..0000000
>--- a/test/data/valid-config-files-system/debug-allow-all-pass.conf.cmake
>+++ /dev/null
>@@ -1,16 +0,0 @@
>-
>-
>-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
>- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
>-<busconfig>
>-  <listen>@TEST_LISTEN@</listen>
>-  <type>system</type>
>-  <servicehelper>@TEST_LAUNCH_HELPER_BINARY@</servicehelper>
>-  <servicedir>@DBUS_TEST_DATA@/valid-service-files-system</servicedir>
>-  <policy context="default">
>-    <allow send_interface="*"/>
>-    <allow receive_interface="*"/>
>-    <allow own="*"/>
>-    <allow user="*"/>
>-  </policy>
>-</busconfig>
>diff --git a/test/data/valid-config-files-system/debug-allow-all-pass.conf.in b/test/data/valid-config-files-system/debug-allow-all-pass.conf.in
>index 6105d84..3836673 100644
>--- a/test/data/valid-config-files-system/debug-allow-all-pass.conf.in
>+++ b/test/data/valid-config-files-system/debug-allow-all-pass.conf.in
>@@ -4,7 +4,7 @@
>  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
> <busconfig>
>   <listen>debug-pipe:name=test-server</listen>
>-  <listen>unix:tmpdir=@TEST_SOCKET_DIR@</listen>
>+  <listen>@TEST_LISTEN@</listen>
>   <type>system</type>
>   <servicehelper>@TEST_LAUNCH_HELPER_BINARY@</servicehelper>
>   <servicedir>@DBUS_TEST_DATA@/valid-service-files-system</servicedir>
>diff --git a/test/data/valid-config-files/debug-allow-all-sha1.conf.cmake b/test/data/valid-config-files/debug-allow-all-sha1.conf.cmake
>deleted file mode 100644
>index 0c66f2a..0000000
>--- a/test/data/valid-config-files/debug-allow-all-sha1.conf.cmake
>+++ /dev/null
>@@ -1,15 +0,0 @@
>-
>-
>-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
>- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
>-<busconfig>
>-  <listen>@TEST_LISTEN@</listen>
>-  <servicedir>@DBUS_TEST_DATA@/valid-service-files</servicedir>
>-  <auth>DBUS_COOKIE_SHA1</auth>
>-  <policy context="default">
>-    <allow send_interface="*"/>
>-    <allow receive_interface="*"/>
>-    <allow own="*"/>
>-    <allow user="*"/>
>-  </policy>
>-</busconfig>
>diff --git a/test/data/valid-config-files/debug-allow-all-sha1.conf.in b/test/data/valid-config-files/debug-allow-all-sha1.conf.in
>index ba68f45..8baee7d 100644
>--- a/test/data/valid-config-files/debug-allow-all-sha1.conf.in
>+++ b/test/data/valid-config-files/debug-allow-all-sha1.conf.in
>@@ -4,7 +4,7 @@
>  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
> <busconfig>
>   <listen>debug-pipe:name=test-server</listen>
>-  <listen>unix:tmpdir=@TEST_SOCKET_DIR@</listen>
>+  <listen>@TEST_LISTEN@</listen>
>   <servicedir>@DBUS_TEST_DATA@/valid-service-files</servicedir>
>   <auth>DBUS_COOKIE_SHA1</auth>
>   <policy context="default">
>diff --git a/test/data/valid-config-files/debug-allow-all.conf.cmake b/test/data/valid-config-files/debug-allow-all.conf.cmake
>deleted file mode 100644
>index adc3aa5..0000000
>--- a/test/data/valid-config-files/debug-allow-all.conf.cmake
>+++ /dev/null
>@@ -1,14 +0,0 @@
>-
>-
>-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
>- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
>-<busconfig>
>-  <listen>@TEST_LISTEN@</listen>
>-  <servicedir>@DBUS_TEST_DATA@/valid-service-files</servicedir>
>-  <policy context="default">
>-    <allow send_interface="*"/>
>-    <allow receive_interface="*"/>
>-    <allow own="*"/>
>-    <allow user="*"/>
>-  </policy>
>-</busconfig>
>diff --git a/test/data/valid-config-files/debug-allow-all.conf.in b/test/data/valid-config-files/debug-allow-all.conf.in
>index a086976..00df20d 100644
>--- a/test/data/valid-config-files/debug-allow-all.conf.in
>+++ b/test/data/valid-config-files/debug-allow-all.conf.in
>@@ -4,7 +4,7 @@
>  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
> <busconfig>
>   <listen>debug-pipe:name=test-server</listen>
>-  <listen>unix:tmpdir=@TEST_SOCKET_DIR@</listen>
>+  <listen>@TEST_LISTEN@</listen>
>   <servicedir>@DBUS_TEST_DATA@/valid-service-files</servicedir>
>   <policy context="default">
>     <allow send_interface="*"/>
>-- 
>1.7.6.3
>

Actions: View | Splinter Review

Attachments on bug 41222: 51632 | 51633 | 51634 | 51636 | 51637 | 51655

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.