diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-10-03 18:49:56 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2019-01-21 15:16:51 +0000 |
| commit | a15839da9b4575a8f9c433c5afed85b02a044162 (patch) | |
| tree | 6c8c373077436b00fb4e09fab627453936a08c4b /cmake | |
| parent | 2732038528711c045f3aad2ebc178af43cf3dfe2 (diff) | |
| download | dbus-a15839da9b4575a8f9c433c5afed85b02a044162.tar.gz | |
test: Move dbus-daemon and d-d-launch-helper tests from bus/
This groups them with the other tests, and avoids having them influence
the test coverage stats in bus/.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/bus/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | cmake/test/CMakeLists.txt | 11 |
2 files changed, 11 insertions, 9 deletions
diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt index 24f3bf69..31a03fff 100644 --- a/cmake/bus/CMakeLists.txt +++ b/cmake/bus/CMakeLists.txt @@ -156,19 +156,10 @@ if(NOT WIN32) endif(NOT WIN32) if (DBUS_ENABLE_EMBEDDED_TESTS) - set(SOURCES ${BUS_DIR}/test-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}) if (NOT WIN32) - add_test_executable(test-bus-system ${BUS_DIR}/test-system.c launch-helper-internal) - add_executable(dbus-daemon-launch-helper-test ${BUS_DIR}/activation-helper.c ${BUS_DIR}/activation-helper-bin.c) set_target_properties(dbus-daemon-launch-helper-test PROPERTIES COMPILE_FLAGS "-DACTIVATION_LAUNCHER_TEST") target_link_libraries(dbus-daemon-launch-helper-test launch-helper-internal) - - set (SOURCES ${BUS_DIR}/activation-helper.c ${BUS_DIR}/test-launch-helper.c) - add_test_executable(test-bus-launch-helper "${SOURCES}" launch-helper-internal) - set_target_properties(test-bus-launch-helper PROPERTIES COMPILE_FLAGS "-DACTIVATION_LAUNCHER_TEST -DACTIVATION_LAUNCHER_DO_OOM") endif() endif (DBUS_ENABLE_EMBEDDED_TESTS) diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index 8d18119c..71d358d3 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -92,6 +92,17 @@ if(WIN32) add_helper_executable(manual-paths ${manual-paths_SOURCES} ${DBUS_INTERNAL_LIBRARIES}) endif() +if(DBUS_ENABLE_EMBEDDED_TESTS) + 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}) + + if(NOT WIN32) + add_test_executable(test-bus-system ${TEST_DIR}/bus/system.c launch-helper-internal) + add_test_executable(test-bus-launch-helper-oom ${TEST_DIR}/bus/launch-helper-oom.c launch-helper-internal) + endif() +endif() + if(DBUS_WITH_GLIB) message(STATUS "with glib test apps") |