diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-10-03 19:15:38 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2019-01-21 15:18:18 +0000 |
| commit | b28e0886ed58570b769d1ea7a8c6518e0fc0237f (patch) | |
| tree | 6a36828a03b1e3ce69ad1deae44d8fdb99a9195a /cmake | |
| parent | 3b512610c0414c4f40c464e1a8dd5d3d665e74d7 (diff) | |
| download | dbus-b28e0886ed58570b769d1ea7a8c6518e0fc0237f.tar.gz | |
test: Move libdbus embedded tests from dbus/ to test/
This groups them with the rest of the tests, and enables parts of
the test code to be unembedded from libdbus and moved to test/ too.
Rename the executable to test-misc-internals, not test-dbus. The name
test-dbus made some sense as "the executable that contains the code in
dbus/", but makes a lot less sense in test/: dbus is the name of the
entire project, so this test has no particular special claim to that
name. test-libdbus doesn't seem right either, because all the tests
exercise libdbus one way or another.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/dbus/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | cmake/test/CMakeLists.txt | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index d25cc961..e178cc02 100644 --- a/cmake/dbus/CMakeLists.txt +++ b/cmake/dbus/CMakeLists.txt @@ -341,11 +341,6 @@ else(WIN32) endif() endif(WIN32) -if (DBUS_ENABLE_EMBEDDED_TESTS) - add_test_executable(test-dbus ${CMAKE_SOURCE_DIR}/../dbus/dbus-test-main.c ${DBUS_INTERNAL_LIBRARIES}) - set_target_properties(test-dbus PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS}) -ENDIF (DBUS_ENABLE_EMBEDDED_TESTS) - if (UNIX) # set version info ENDIF (UNIX) diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index 02143898..ccc783e7 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -93,6 +93,9 @@ if(WIN32) endif() if(DBUS_ENABLE_EMBEDDED_TESTS) + add_test_executable(test-misc-internals ${TEST_DIR}/internals/misc-internals.c ${DBUS_INTERNAL_LIBRARIES}) + set_target_properties(test-misc-internals PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS}) + set(SOURCES ${TEST_DIR}/bus/main.c) add_test_executable(test-bus "${SOURCES}" dbus-daemon-internal ${DBUS_INTERNAL_LIBRARIES} ${EXPAT_LIBRARIES}) set_target_properties(test-bus PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS}) |