From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 8 Jan 2014 01:03:14 +0000 (+0100)
Subject: Create session.conf and system.conf for test/data/valid-config-files from *.in files... 
X-Git-Tag: dbus-1.8.0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21ad24ada51fbb1defae07caae31cb5c888410f6;p=thirdparty%2Fdbus.git

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

diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index e29a4993d..ba1b56b3b 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)