diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2014-01-08 02:03:14 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2014-01-10 00:48:50 +0100 |
| commit | 21ad24ada51fbb1defae07caae31cb5c888410f6 (patch) | |
| tree | 7c8f992291c0a4e074e93187d13aebfd69be5236 | |
| parent | 67a78c4ef6ada862b5dc584cc450db5694d882d3 (diff) | |
| download | dbus-21ad24ada51fbb1defae07caae31cb5c888410f6.tar.gz | |
Create session.conf and system.conf for test/data/valid-config-files from *.in files on cmake.
We need to patch the listen address.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | cmake/test/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index e29a4993..ba1b56b3 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -1,6 +1,8 @@ add_definitions(${DBUS_INTERNAL_CLIENT_DEFINITIONS}) +set(DBUS_SESSION_BUS_LISTEN_ADDRESS ${TEST_LISTEN}) + add_library(dbus-testutils STATIC ${CMAKE_SOURCE_DIR}/../test/test-utils.h ${CMAKE_SOURCE_DIR}/../test/test-utils.c @@ -184,12 +186,13 @@ ENDFOREACH(FILE_TYPE) MESSAGE(STATUS "Copying generated bus config files to test directory") set (OUTDIR ${CMAKE_BINARY_DIR}/test/data/valid-config-files) -FILE(GLOB FILES "${CMAKE_BINARY_DIR}/bus/*.conf" ) +FILE(GLOB FILES "${CMAKE_SOURCE_DIR}/../bus/*.conf.in" ) FILE(MAKE_DIRECTORY ${OUTDIR}) FOREACH(FILE ${FILES}) GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME) + STRING(REGEX REPLACE "\\.in$" "" FILENAME ${FILENAME}) SET (TARGET ${OUTDIR}/${FILENAME}) - configure_file(${FILE} ${TARGET} COPYONLY) + configure_file(${FILE} ${TARGET} @ONLY) IF (CONFIG_VERBOSE) MESSAGE("FROM: ${FILE}\nTO: ${TARGET}\n") ENDIF (CONFIG_VERBOSE) |