diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-09-16 17:40:29 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-09-28 19:00:11 +0100 |
| commit | 6934bc6927a3846d096bd3549f0ed06c901bb9f2 (patch) | |
| tree | 15de860bfd12e9e223175768d07a6a8ecfa871ef /test/data/valid-config-files | |
| parent | ba033709b54df18bbe48b22303e0c3d514f547f8 (diff) | |
Simplify generation of bus configuration files
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41222
Diffstat (limited to 'test/data/valid-config-files')
4 files changed, 4 insertions, 4 deletions
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 index 416267c1..0c66f2ae 100644 --- a/test/data/valid-config-files/debug-allow-all-sha1.conf.cmake +++ b/test/data/valid-config-files/debug-allow-all-sha1.conf.cmake @@ -4,7 +4,7 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <busconfig> <listen>@TEST_LISTEN@</listen> - <servicedir>@TEST_VALID_SERVICE_DIR@</servicedir> + <servicedir>@DBUS_TEST_DATA@/valid-service-files</servicedir> <auth>DBUS_COOKIE_SHA1</auth> <policy context="default"> <allow send_interface="*"/> diff --git a/test/data/valid-config-files/debug-allow-all-sha1.conf.in b/test/data/valid-config-files/debug-allow-all-sha1.conf.in index 34c50856..ba68f453 100644 --- a/test/data/valid-config-files/debug-allow-all-sha1.conf.in +++ b/test/data/valid-config-files/debug-allow-all-sha1.conf.in @@ -5,7 +5,7 @@ <busconfig> <listen>debug-pipe:name=test-server</listen> <listen>unix:tmpdir=@TEST_SOCKET_DIR@</listen> - <servicedir>@TEST_VALID_SERVICE_DIR@</servicedir> + <servicedir>@DBUS_TEST_DATA@/valid-service-files</servicedir> <auth>DBUS_COOKIE_SHA1</auth> <policy context="default"> <allow send_interface="*"/> diff --git a/test/data/valid-config-files/debug-allow-all.conf.cmake b/test/data/valid-config-files/debug-allow-all.conf.cmake index 94bb21e7..adc3aa59 100644 --- a/test/data/valid-config-files/debug-allow-all.conf.cmake +++ b/test/data/valid-config-files/debug-allow-all.conf.cmake @@ -4,7 +4,7 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <busconfig> <listen>@TEST_LISTEN@</listen> - <servicedir>@TEST_VALID_SERVICE_DIR@</servicedir> + <servicedir>@DBUS_TEST_DATA@/valid-service-files</servicedir> <policy context="default"> <allow send_interface="*"/> <allow receive_interface="*"/> diff --git a/test/data/valid-config-files/debug-allow-all.conf.in b/test/data/valid-config-files/debug-allow-all.conf.in index 3514296f..a086976b 100644 --- a/test/data/valid-config-files/debug-allow-all.conf.in +++ b/test/data/valid-config-files/debug-allow-all.conf.in @@ -5,7 +5,7 @@ <busconfig> <listen>debug-pipe:name=test-server</listen> <listen>unix:tmpdir=@TEST_SOCKET_DIR@</listen> - <servicedir>@TEST_VALID_SERVICE_DIR@</servicedir> + <servicedir>@DBUS_TEST_DATA@/valid-service-files</servicedir> <policy context="default"> <allow send_interface="*"/> <allow receive_interface="*"/> |