summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--cmake/CMakeLists.txt18
2 files changed, 10 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 51de05b5..d55bdb55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-22 Ralf.Habacker <ralf.habacker@freenet.de>
+
+ * cmake/CMakeLists.txt: fixed creating of TEST_..._BINARY to make
+ bus-test able to find the binaries.
+
2007-05-21 Simon McVittie <simon.mcvittie@collabora.co.uk>
* acinclude.m4, configure.in: In recent autotools, ${datadir} is
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 049323ab..6cc0ac8c 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -333,20 +333,12 @@ if (WIN32)
set (EXT ".exe")
endif(WIN32)
-# confirure.in:
-#TEST_PATH(SERVICE_DIR, data/valid-service-files)
-#TEST_PATH(SERVICE_BINARY, test-service)
-#TEST_PATH(SHELL_SERVICE_BINARY, test-shell-service)
-#TEST_PATH(EXIT_BINARY, test-exit)
-#TEST_PATH(SEGFAULT_BINARY, test-segfault)
-#TEST_PATH(SLEEP_FOREVER_BINARY, test-sleep-forever)
-
set(TEST_SERVICE_DIR ${CMAKE_BINARY_DIR}/test/data/valid-service-files CACHE STRING "Full path to test file test/data/valid-service-files in builddir")
-set(TEST_SERVICE_BINARY ${EXPANDED_BINDIR}/test-service${EXT} CACHE STRING "Full path to test file test/test-service in builddir")
-set(TEST_SHELL_SERVICE_BINARY ${EXPANDED_BINDIR}/test-shell-service${EXT} CACHE STRING "Full path to test file test/test-shell-service in builddir")
-set(TEST_EXIT_BINARY ${EXPANDED_BINDIR}/test-exit${EXT} CACHE STRING "Full path to test file test/test-exit in builddir")
-set(TEST_SEGFAULT_BINARY ${EXPANDED_BINDIR}/test-segfault${EXT} CACHE STRING "Full path to test file test/test-segfault in builddir")
-set(TEST_SLEEP_FOREVER_BINARY ${EXPANDED_BINDIR}/test-sleep-forever${EXT} CACHE STRING "Full path to test file test/test-sleep-forever in builddir")
+set(TEST_SERVICE_BINARY ${CMAKE_BINARY_DIR}/bin/test-service${EXT} CACHE STRING "Full path to test file test/test-service in builddir")
+set(TEST_SHELL_SERVICE_BINARY ${CMAKE_BINARY_DIR}/bin/test-shell-service${EXT} CACHE STRING "Full path to test file test/test-shell-service in builddir")
+set(TEST_EXIT_BINARY ${CMAKE_BINARY_DIR}/bin/test-exit${EXT} CACHE STRING "Full path to test file test/test-exit in builddir")
+set(TEST_SEGFAULT_BINARY ${CMAKE_BINARY_DIR}/bin/test-segfault${EXT} CACHE STRING "Full path to test file test/test-segfault in builddir")
+set(TEST_SLEEP_FOREVER_BINARY ${CMAKE_BINARY_DIR}/bin/test-sleep-forever${EXT} CACHE STRING "Full path to test file test/test-sleep-forever in builddir")
#### Find socket directories
if (NOT WIN32)