From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Tue, 1 Dec 2009 09:53:53 +0000 (+0100)
Subject: readded test files required for windows
X-Git-Tag: dbus-1.3.1~140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a24e84aa72fb1a0fe73a86a9365ae686e8878f7;p=thirdparty%2Fdbus.git

readded test files required for windows
---

diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index 310d084c1..a84bfd1cb 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 000000000..416267c1d
--- /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 000000000..94bb21e72
--- /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>