mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-22 17:18:09 +02:00
e9f0378bbf
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. Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
252 lines
6.3 KiB
CMake
252 lines
6.3 KiB
CMake
/* config.h. Generated by cmake from config.h.cmake */
|
|
|
|
#ifndef _DBUS_CONFIG_H
|
|
#define _DBUS_CONFIG_H
|
|
/****************************/
|
|
/* indicate that we are building with cmake */
|
|
#define DBUS_CMAKE 1
|
|
|
|
#cmakedefine HAVE_GNUC_VARARGS 1
|
|
|
|
#cmakedefine DBUS_CONSOLE_AUTH_DIR "@DBUS_CONSOLE_AUTH_DIR@"
|
|
#cmakedefine DBUS_DATADIR "@DBUS_DATADIR@"
|
|
#cmakedefine DBUS_BINDIR "@DBUS_BINDIR@"
|
|
#cmakedefine DBUS_SYSTEM_CONFIG_FILE "@DBUS_SYSTEM_CONFIG_FILE@"
|
|
#cmakedefine DBUS_SESSION_CONFIG_FILE "@DBUS_SESSION_CONFIG_FILE@"
|
|
#cmakedefine DBUS_DAEMON_NAME "@DBUS_DAEMON_NAME@"
|
|
#cmakedefine DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@"
|
|
#cmakedefine DBUS_MACHINE_UUID_FILE "@DBUS_MACHINE_UUID_FILE@"
|
|
#cmakedefine DBUS_SESSION_BUS_DEFAULT_ADDRESS "@DBUS_SESSION_BUS_DEFAULT_ADDRESS@"
|
|
#cmakedefine DBUS_DAEMONDIR "@DBUS_DAEMONDIR@"
|
|
#cmakedefine PACKAGE "@PACKAGE@"
|
|
/* Version number of package */
|
|
#cmakedefine DBUS_MAJOR_VERSION @DBUS_MAJOR_VERSION@
|
|
#cmakedefine DBUS_MINOR_VERSION @DBUS_MINOR_VERSION@
|
|
#cmakedefine DBUS_MICRO_VERSION @DBUS_MICRO_VERSION@
|
|
#cmakedefine DBUS_VERSION ((@DBUS_MAJOR_VERSION@ << 16) | (@DBUS_MINOR_VERSION@ << 8) | (@DBUS_MICRO_VERSION@))
|
|
#cmakedefine DBUS_VERSION_STRING "@DBUS_VERSION_STRING@"
|
|
#cmakedefine DBUS_ENABLE_STATS
|
|
|
|
#define VERSION DBUS_VERSION_STRING
|
|
|
|
#define TEST_LISTEN "@TEST_LISTEN@"
|
|
|
|
// test binaries
|
|
#define DBUS_TEST_EXEC "@DBUS_TEST_EXEC@"
|
|
#define DBUS_EXEEXT "@EXEEXT@"
|
|
|
|
/* Full path to test file test/test-exit in builddir */
|
|
#define TEST_BUS_BINARY "@TEST_BUS_BINARY@"
|
|
|
|
/* Some dbus features */
|
|
#cmakedefine DBUS_BUILD_TESTS 1
|
|
#cmakedefine DBUS_ENABLE_ANSI 1
|
|
#cmakedefine DBUS_ENABLE_VERBOSE_MODE 1
|
|
#cmakedefine DBUS_DISABLE_ASSERTS 1
|
|
#cmakedefine DBUS_DISABLE_CHECKS 1
|
|
/* xmldocs */
|
|
/* doxygen */
|
|
#cmakedefine DBUS_GCOV_ENABLED 1
|
|
|
|
/* abstract-sockets */
|
|
|
|
#cmakedefine HAVE_ABSTRACT_SOCKETS 1
|
|
|
|
#cmakedefine DBUS_PATH_OR_ABSTRACT_VALUE 1
|
|
|
|
#if (defined DBUS_PATH_OR_ABSTRACT_VALUE)
|
|
#define DBUS_PATH_OR_ABSTRACT @DBUS_PATH_OR_ABSTRACT_VALUE@
|
|
#endif
|
|
|
|
#ifdef DBUS_PATH_OR_ABSTRACT_VALUE
|
|
#undef DBUS_PATH_OR_ABSTRACT_VALUE
|
|
#endif
|
|
|
|
/* selinux */
|
|
#cmakedefine DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX 1
|
|
/* kqueue */
|
|
#cmakedefine HAVE_CONSOLE_OWNER_FILE 1
|
|
#define DBUS_CONSOLE_OWNER_FILE "@DBUS_CONSOLE_OWNER_FILE@"
|
|
|
|
#cmakedefine DBUS_HAVE_ATOMIC_INT 1
|
|
#cmakedefine DBUS_USE_ATOMIC_INT_486 1
|
|
#if (defined(__i386__) || defined(__x86_64__))
|
|
# define DBUS_HAVE_ATOMIC_INT 1
|
|
# define DBUS_USE_ATOMIC_INT_486 1
|
|
#endif
|
|
|
|
#cmakedefine DBUS_BUILD_X11 1
|
|
/* For the moment, the cmake build system doesn't have an equivalent of
|
|
* the autoconf build system's --disable-x11-autolaunch */
|
|
#ifdef DBUS_BUILD_X11
|
|
# define DBUS_ENABLE_X11_AUTOLAUNCH 1
|
|
#endif
|
|
|
|
#define _DBUS_VA_COPY_ASSIGN(a1,a2) { a1 = a2; }
|
|
|
|
#cmakedefine DBUS_VA_COPY_FUNC
|
|
#if (defined DBUS_VA_COPY_FUNC)
|
|
# define DBUS_VA_COPY @DBUS_VA_COPY_FUNC@
|
|
#endif
|
|
|
|
#ifdef DBUS_VA_COPY_FUNC
|
|
#undef DBUS_VA_COPY_FUNC
|
|
#endif
|
|
|
|
#cmakedefine DBUS_VA_COPY_AS_ARRAY @DBUS_VA_COPY_AS_ARRAY@
|
|
|
|
// headers
|
|
/* Define to 1 if you have dirent.h */
|
|
#cmakedefine HAVE_DIRENT_H 1
|
|
|
|
/* Define to 1 if you have io.h */
|
|
#cmakedefine HAVE_IO_H 1
|
|
|
|
/* Define to 1 if you have grp.h */
|
|
#cmakedefine HAVE_GRP_H 1
|
|
|
|
/* Define to 1 if you have sys/poll.h */
|
|
#cmakedefine HAVE_POLL 1
|
|
|
|
/* Define to 1 if you have sys/time.h */
|
|
#cmakedefine HAVE_SYS_TIME 1
|
|
|
|
/* Define to 1 if you have sys/wait.h */
|
|
#cmakedefine HAVE_SYS_WAIT 1
|
|
|
|
/* Define to 1 if you have time.h */
|
|
#cmakedefine HAVE_TIME_H 1
|
|
|
|
/* Define to 1 if you have ws2tcpip.h */
|
|
#cmakedefine HAVE_WS2TCPIP_H
|
|
|
|
/* Define to 1 if you have wspiapi.h */
|
|
#cmakedefine HAVE_WSPIAPI_H 1
|
|
|
|
/* Define to 1 if you have unistd.h */
|
|
#cmakedefine HAVE_UNISTD_H 1
|
|
|
|
/* Define to 1 if you have stdio.h */
|
|
#cmakedefine HAVE_STDIO_H 1
|
|
|
|
/* Define to 1 if you have sys/syslimits.h */
|
|
#cmakedefine HAVE_SYS_SYSLIMITS_H 1
|
|
|
|
/* Define to 1 if you have errno.h */
|
|
#cmakedefine HAVE_ERRNO_H 1
|
|
|
|
/* Define to 1 if you have signal.h */
|
|
#cmakedefine HAVE_SIGNAL_H 1
|
|
|
|
/* Define to 1 if you have locale.h */
|
|
#cmakedefine HAVE_LOCALE_H 1
|
|
|
|
/* Define to 1 if you have inttypes.h */
|
|
#cmakedefine HAVE_INTTYPES_H 1
|
|
|
|
/* Define to 1 if you have stdint.h */
|
|
#cmakedefine HAVE_STDINT_H 1
|
|
|
|
// symbols
|
|
/* Define to 1 if you have backtrace */
|
|
#cmakedefine HAVE_BACKTRACE 1
|
|
|
|
/* Define to 1 if you have getgrouplist */
|
|
#cmakedefine HAVE_GETGROUPLIST 1
|
|
|
|
/* Define to 1 if you have getpeerucred */
|
|
#cmakedefine HAVE_GETPEERUCRED 1
|
|
|
|
/* Define to 1 if you have nanosleep */
|
|
#cmakedefine HAVE_NANOSLEEP 1
|
|
|
|
/* Define to 1 if you have getpwnam_r */
|
|
#cmakedefine HAVE_POSIX_GETPWNAM_R 1
|
|
|
|
/* Define to 1 if you have socketpair */
|
|
#cmakedefine HAVE_SOCKETPAIR 1
|
|
|
|
/* Define to 1 if you have setenv */
|
|
#cmakedefine HAVE_SETENV 1
|
|
|
|
/* Define to 1 if you have unsetenv */
|
|
#cmakedefine HAVE_UNSETENV 1
|
|
|
|
/* Define to 1 if you have clearenv */
|
|
#cmakedefine HAVE_CLEARENV 1
|
|
|
|
/* Define to 1 if you have writev */
|
|
#cmakedefine HAVE_WRITEV 1
|
|
|
|
/* Define to 1 if you have socklen_t */
|
|
#cmakedefine HAVE_SOCKLEN_T 1
|
|
|
|
/* Define to 1 if you have setlocale */
|
|
#cmakedefine HAVE_SETLOCALE 1
|
|
|
|
/* Define to 1 if you have localeconv */
|
|
#cmakedefine HAVE_LOCALECONV 1
|
|
|
|
/* Define to 1 if you have strtoll */
|
|
#cmakedefine HAVE_STRTOLL 1
|
|
|
|
/* Define to 1 if you have strtoull */
|
|
#cmakedefine HAVE_STRTOULL 1
|
|
|
|
// structs
|
|
/* Define to 1 if you have struct cmsgred */
|
|
#cmakedefine HAVE_CMSGCRED 1
|
|
|
|
// system type defines
|
|
#if defined(_WIN32) || defined(_WIN64) || defined (_WIN32_WCE)
|
|
# define DBUS_WIN
|
|
# define DBUS_WIN_FIXME 1
|
|
# ifdef _WIN32_WCE
|
|
# define DBUS_WINCE
|
|
# else
|
|
# define DBUS_WIN32
|
|
# endif
|
|
#else
|
|
# define DBUS_UNIX
|
|
#endif
|
|
|
|
#if defined(_WIN32) || defined(_WIN64)
|
|
// mingw mode_t
|
|
# ifdef HAVE_STDIO_H
|
|
# include <stdio.h>
|
|
# endif
|
|
# ifndef _MSC_VER
|
|
# define uid_t int
|
|
# define gid_t int
|
|
# else
|
|
# define snprintf _snprintf
|
|
typedef int mode_t;
|
|
# if !defined(_WIN32_WCE)
|
|
# define strtoll _strtoi64
|
|
# define strtoull _strtoui64
|
|
# define HAVE_STRTOLL 1
|
|
# define HAVE_STRTOULL 1
|
|
# endif
|
|
# endif
|
|
#endif // defined(_WIN32) || defined(_WIN64)
|
|
|
|
#ifdef interface
|
|
#undef interface
|
|
#endif
|
|
|
|
#ifndef SIGHUP
|
|
#define SIGHUP 1
|
|
#endif
|
|
|
|
#cmakedefine DBUS_VERBOSE_C_S 1
|
|
#ifdef DBUS_VERBOSE_C_S
|
|
#define _dbus_verbose_C_S printf
|
|
#else
|
|
#define _dbus_verbose_C_S _dbus_verbose
|
|
#endif
|
|
|
|
# if defined(_MSC_VER) && !defined(inline)
|
|
#define inline __inline
|
|
#endif
|
|
|
|
#endif // _DBUS_CONFIG_H
|