From 4a24e84aa72fb1a0fe73a86a9365ae686e8878f7 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 1 Dec 2009 10:53:53 +0100 Subject: readded test files required for windows --- cmake/test/CMakeLists.txt | 10 ++++++++++ .../valid-config-files/debug-allow-all-sha1.conf.cmake | 15 +++++++++++++++ test/data/valid-config-files/debug-allow-all.conf.cmake | 14 ++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 test/data/valid-config-files/debug-allow-all-sha1.conf.cmake create mode 100644 test/data/valid-config-files/debug-allow-all.conf.cmake diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index 310d084c..a84bfd1c 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -172,6 +172,16 @@ FOREACH(FILE_TYPE *.conf.in *.service.in) ENDFOREACH(DIR) ENDFOREACH(FILE_TYPE) +# +# the following config files are required on windows because the related +# *.in files are not customized sufficiently. +# TODO merge test/data/valid-config-files/debug-allow-all*.conf.in and ....cmake +# +SET (CONFIG_FILES test/data/valid-config-files) +set (TEST_LISTEN "tcp:host=localhost,port=1234") +configure_file(${CMAKE_SOURCE_DIR}/../${CONFIG_FILES}/debug-allow-all-sha1.conf.cmake ${CMAKE_BINARY_DIR}/${CONFIG_FILES}/debug-allow-all-sha1.conf ) +configure_file(${CMAKE_SOURCE_DIR}/../${CONFIG_FILES}/debug-allow-all.conf.cmake ${CMAKE_BINARY_DIR}/${CONFIG_FILES}/debug-allow-all.conf ) + # todo: for installation the TEST_..._BINARY variables must reflect the # installation dir or has to be defined relative # diff --git a/test/data/valid-config-files/debug-allow-all-sha1.conf.cmake b/test/data/valid-config-files/debug-allow-all-sha1.conf.cmake new file mode 100644 index 00000000..416267c1 --- /dev/null +++ b/test/data/valid-config-files/debug-allow-all-sha1.conf.cmake @@ -0,0 +1,15 @@ + + + + + @TEST_LISTEN@ + @TEST_VALID_SERVICE_DIR@ + DBUS_COOKIE_SHA1 + + + + + + + diff --git a/test/data/valid-config-files/debug-allow-all.conf.cmake b/test/data/valid-config-files/debug-allow-all.conf.cmake new file mode 100644 index 00000000..94bb21e7 --- /dev/null +++ b/test/data/valid-config-files/debug-allow-all.conf.cmake @@ -0,0 +1,14 @@ + + + + + @TEST_LISTEN@ + @TEST_VALID_SERVICE_DIR@ + + + + + + + -- cgit v1.2.3