fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-02 20:08:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Define DBUS_COMPILATION externally for all tests that use internal stuff

Browse source 
It might as well go in the AM_CPPFLAGS rather than in the source code.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
This commit is contained in:
Simon McVittie 2013-08-30 17:45:52 +01:00
parent ce334cb0d6
commit f17fd1cc4e
8 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/CMakeLists.txt
View file

@ -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 )

1
test/Makefile.am
View file

@ -19,6 +19,7 @@ AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
static_cppflags = \
$(AM_CPPFLAGS) \
-DDBUS_STATIC_BUILD \
-DDBUS_COMPILATION \
$(NULL)
libdbus_testutils_la_CPPFLAGS = \

1
test/internals/printf.c
View file

@ -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>

1
test/internals/refs.c
View file

@ -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>

1
test/internals/syslog.c
View file

@ -30,7 +30,6 @@
#include <glib.h>
#define DBUS_COMPILATION /* this test uses libdbus-internal */
#include <dbus/dbus.h>
#include <dbus/dbus-sysdeps.h>

2
test/shell-test.c
View file

@ -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>

2
test/spawn-test.c
View file

@ -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

4
test/test-utils.h
View file

@ -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);