Attachment 85074 Details for Bug 68852 – 4/6] Define DBUS_COMPILATION externally for all tests that use internal stuff

[patch] 4/6] Define DBUS_COMPILATION externally for all tests that use internal stuff

0004-Define-DBUS_COMPILATION-externally-for-all-tests-tha.patch (text/plain), 3.88 KB, created by Simon McVittie on 2013-09-02 16:23:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-09-02 16:23:51 UTC

Size: 3.88 KB

patch

obsolete

>From 60cc0513834f488a0e2e1d748d6a00b76fd4591d Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 30 Aug 2013 17:45:52 +0100
>Subject: [PATCH 4/6] Define DBUS_COMPILATION externally for all tests that use
> internal stuff
>
>It might as well go in the AM_CPPFLAGS rather than in the source code.
>---
> cmake/CMakeLists.txt    | 2 +-
> test/Makefile.am        | 1 +
> test/internals/printf.c | 1 -
> test/internals/refs.c   | 1 -
> test/internals/syslog.c | 1 -
> test/shell-test.c       | 2 +-
> test/spawn-test.c       | 2 --
> test/test-utils.h       | 4 ----
> 8 files changed, 3 insertions(+), 11 deletions(-)
>
>diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
>index bde43f0..32edc51 100644
>--- a/cmake/CMakeLists.txt
>+++ b/cmake/CMakeLists.txt
>@@ -478,7 +478,7 @@ set(DBUS_INTERNAL_LIBRARIES dbus-internal)
> # important note: DBUS_INTERNAL_xxxxx_DEFINITIONS must *not* be set when building dbus-1 library
> set (DBUS_INTERNAL_ADD_LIBRARY_OPTIONS STATIC)
> set (DBUS_INTERNAL_LIBRARY_DEFINITIONS "-DDBUS_STATIC_BUILD")
>-set (DBUS_INTERNAL_CLIENT_DEFINITIONS "-DDBUS_STATIC_BUILD")
>+set (DBUS_INTERNAL_CLIENT_DEFINITIONS "-DDBUS_STATIC_BUILD -DDBUS_COMPILATION")
> 
> configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
> 
>diff --git a/test/Makefile.am b/test/Makefile.am
>index 8b2a525..fe163c6 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -19,6 +19,7 @@ AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
> static_cppflags = \
> 	$(AM_CPPFLAGS) \
> 	-DDBUS_STATIC_BUILD \
>+	-DDBUS_COMPILATION \
> 	$(NULL)
> 
> libdbus_testutils_la_CPPFLAGS = \
>diff --git a/test/internals/printf.c b/test/internals/printf.c
>index 2d2fff8..db15151 100644
>--- a/test/internals/printf.c
>+++ b/test/internals/printf.c
>@@ -26,7 +26,6 @@
> 
> #include <config.h>
> 
>-#define DBUS_COMPILATION    /* this test uses libdbus-internal */
> #include <dbus/dbus.h>
> #include <dbus/dbus-internals.h>
> #include <dbus/dbus-string.h>
>diff --git a/test/internals/refs.c b/test/internals/refs.c
>index db43a4d..202dc04 100644
>--- a/test/internals/refs.c
>+++ b/test/internals/refs.c
>@@ -29,7 +29,6 @@
> #include <glib.h>
> #include <glib-object.h>
> 
>-#define DBUS_COMPILATION    /* this test uses libdbus-internal */
> #include <dbus/dbus.h>
> #include <dbus/dbus-connection-internal.h>
> #include <dbus/dbus-mainloop.h>
>diff --git a/test/internals/syslog.c b/test/internals/syslog.c
>index 658281c..2811b75 100644
>--- a/test/internals/syslog.c
>+++ b/test/internals/syslog.c
>@@ -30,7 +30,6 @@
> 
> #include <glib.h>
> 
>-#define DBUS_COMPILATION    /* this test uses libdbus-internal */
> #include <dbus/dbus.h>
> #include <dbus/dbus-sysdeps.h>
> 
>diff --git a/test/shell-test.c b/test/shell-test.c
>index b479a9c..d1dc5b5 100644
>--- a/test/shell-test.c
>+++ b/test/shell-test.c
>@@ -1,7 +1,7 @@
> #include <config.h>
> #include <stdio.h>
> #include <stdlib.h>
>-#define DBUS_COMPILATION
>+
> #include <dbus/dbus-internals.h>
> #include <dbus/dbus-list.h>
> #include <dbus/dbus-memory.h>
>diff --git a/test/spawn-test.c b/test/spawn-test.c
>index f1a5505..e6513fa 100644
>--- a/test/spawn-test.c
>+++ b/test/spawn-test.c
>@@ -1,10 +1,8 @@
> #include <config.h>
> #include <dbus/dbus.h>
> 
>-#define DBUS_COMPILATION /* cheat and use dbus-sysdeps */
> #include <dbus/dbus-sysdeps.h>
> #include <dbus/dbus-spawn.h>
>-#undef DBUS_COMPILATION
> #include <stdio.h>
> 
> static void
>diff --git a/test/test-utils.h b/test/test-utils.h
>index 3e1e55e..8d5357e 100644
>--- a/test/test-utils.h
>+++ b/test/test-utils.h
>@@ -1,14 +1,10 @@
> #ifndef TEST_UTILS_H
> #define TEST_UTILS_H
>-#ifndef DBUS_COMPILATION
>-#define DBUS_COMPILATION /* Cheat and use private stuff */
>-#endif
> #include <dbus/dbus.h>
> #include <stdio.h>
> #include <stdlib.h>
> #include <dbus/dbus-mainloop.h>
> #include <dbus/dbus-internals.h>
>-#undef DBUS_COMPILATION
> 
> dbus_bool_t test_connection_setup                 (DBusLoop       *loop,
>                                                    DBusConnection *connection);
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 68852: 85071 | 85072 | 85073 | 85074 | 85076 | 85077 | 85082 | 85109 | 85110 | 85240 | 85604

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.