diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2009-12-01 10:53:53 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2009-12-01 10:53:53 +0100 |
| commit | 4a24e84aa72fb1a0fe73a86a9365ae686e8878f7 (patch) | |
| tree | 18a3a5e17dc627881c2cac5bca0b38295bd2f9f4 | |
| parent | c4276d5901172a653515a63991cb21c112d1b99d (diff) | |
readded test files required for windows
| -rw-r--r-- | cmake/test/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | test/data/valid-config-files/debug-allow-all-sha1.conf.cmake | 15 | ||||
| -rw-r--r-- | test/data/valid-config-files/debug-allow-all.conf.cmake | 14 |
3 files changed, 39 insertions, 0 deletions
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 @@ +<!-- Bus that listens on a debug pipe and requires SHA1 auth, used to test SHA1 --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <listen>@TEST_LISTEN@</listen> + <servicedir>@TEST_VALID_SERVICE_DIR@</servicedir> + <auth>DBUS_COOKIE_SHA1</auth> + <policy context="default"> + <allow send_interface="*"/> + <allow receive_interface="*"/> + <allow own="*"/> + <allow user="*"/> + </policy> +</busconfig> 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 @@ +<!-- Bus that listens on a debug pipe and doesn't create any restrictions --> + +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <listen>@TEST_LISTEN@</listen> + <servicedir>@TEST_VALID_SERVICE_DIR@</servicedir> + <policy context="default"> + <allow send_interface="*"/> + <allow receive_interface="*"/> + <allow own="*"/> + <allow user="*"/> + </policy> +</busconfig> |