summaryrefslogtreecommitdiff
path: root/cmake/test
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2010-04-11 00:45:15 +0200
committerRalf Habacker <ralf.habacker@freenet.de>2010-04-13 21:18:41 +0200
commit280cdc2ad818fa603ac4e9ca7344a953b17d1f1a (patch)
treea11a9b59e7cf3739a34f0b057899e526ca369e86 /cmake/test
parentae9edf9b0d185eab361c71f6af27f2f5b75875ca (diff)
downloaddbus-280cdc2ad818fa603ac4e9ca7344a953b17d1f1a.tar.gz
Added missing test libraries and tools to keep in sync with autotools.
Diffstat (limited to 'cmake/test')
-rw-r--r--cmake/test/CMakeLists.txt6
-rw-r--r--cmake/test/name-test/CMakeLists.txt20
2 files changed, 26 insertions, 0 deletions
diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index 1dcffafa..7bb80aba 100644
--- a/cmake/test/CMakeLists.txt
+++ b/cmake/test/CMakeLists.txt
@@ -2,6 +2,12 @@ project(test)
add_definitions(${DBUS_INTERNAL_CLIENT_DEFINITIONS})
+add_library(dbus_testutils STATIC
+ ${CMAKE_SOURCE_DIR}/../test/test-utils.h
+ ${CMAKE_SOURCE_DIR}/../test/test-utils.c
+)
+target_link_libraries(dbus_testutils ${DBUS_INTERNAL_LIBRARIES})
+
add_subdirectory( name-test )
set (test-service_SOURCES
diff --git a/cmake/test/name-test/CMakeLists.txt b/cmake/test/name-test/CMakeLists.txt
index aad1ad49..6982722d 100644
--- a/cmake/test/name-test/CMakeLists.txt
+++ b/cmake/test/name-test/CMakeLists.txt
@@ -8,8 +8,28 @@ add_executable(test-pending-call-dispatch ${NAMEtest-DIR}/test-pending-call-disp
target_link_libraries(test-pending-call-dispatch ${DBUS_INTERNAL_LIBRARIES})
ADD_TEST(test-pending-call-dispatch ${EXECUTABLE_OUTPUT_PATH}/test-pending-call-dispatch)
+add_executable(test-pending-call-timeout ${NAMEtest-DIR}/test-pending-call-timeout.c)
+target_link_libraries(test-pending-call-timeout ${DBUS_INTERNAL_LIBRARIES})
+ADD_TEST(test-pending-call-timeout ${EXECUTABLE_OUTPUT_PATH}/test-pending-call-timeout)
+
add_executable(test-thread-init ${NAMEtest-DIR}/test-threads-init.c)
target_link_libraries(test-thread-init ${DBUS_INTERNAL_LIBRARIES})
ADD_TEST(test-thread-init ${EXECUTABLE_OUTPUT_PATH}/test-thread-init)
+add_executable(test-ids ${NAMEtest-DIR}/test-ids.c)
+target_link_libraries(test-ids ${DBUS_INTERNAL_LIBRARIES})
+ADD_TEST(test-ids ${EXECUTABLE_OUTPUT_PATH}/test-ids)
+
+add_executable(test-shutdown ${NAMEtest-DIR}/test-shutdown.c)
+target_link_libraries(test-shutdown ${DBUS_INTERNAL_LIBRARIES} dbus_testutils)
+ADD_TEST(test-shutdown ${EXECUTABLE_OUTPUT_PATH}/test-shutdown)
+
+add_executable(test-privserver ${NAMEtest-DIR}/test-privserver.c)
+target_link_libraries(test-privserver ${DBUS_INTERNAL_LIBRARIES} dbus_testutils)
+ADD_TEST(test-privserver ${EXECUTABLE_OUTPUT_PATH}/test-privserver)
+
+add_executable(test-privserver-client ${NAMEtest-DIR}/test-privserver-client.c)
+target_link_libraries(test-privserver-client ${DBUS_INTERNAL_LIBRARIES} dbus_testutils)
+ADD_TEST(test-privserver-client ${EXECUTABLE_OUTPUT_PATH}/test-privserver-client)
+
endif (DBUS_BUILD_TESTS)