diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-12-11 11:52:38 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-12-13 13:08:00 +0000 |
| commit | 9490e954d0cce75f5c1aad10b6b3c67f5c4a082e (patch) | |
| tree | 4726f16d4719fb0a9a52706c614a808387f0ab8a /cmake | |
| parent | 0d79fa68c066e5b38b310be3066d22c813561d43 (diff) | |
| download | dbus-9490e954d0cce75f5c1aad10b6b3c67f5c4a082e.tar.gz | |
test-privserver: Move helper executable out of name-test/
This means we don't need to distinguish between DBUS_NAME_TEST_EXEC and
DBUS_TEST_EXEC any more, because all test helper executables are in the
same place, both during build and when installed (we don't install
test-privserver since no installed test requires it yet, but in
principle we could).
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmake/test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmake/test/name-test/CMakeLists.txt | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index b0aa760e..884b277f 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -483,7 +483,6 @@ add_definitions(${DBUS_BUS_CFLAGS}) if (DBUS_BUILD_TESTS) # set variables used for the .in files (substituted by configure_file) in test/data: set(DBUS_TEST_EXEC ${Z_DRIVE_IF_WINE}${EXECUTABLE_OUTPUT_PATH}${IDE_BIN}) - set(DBUS_NAME_TEST_EXEC ${DBUS_TEST_EXEC}) set(DBUS_TEST_DATA ${Z_DRIVE_IF_WINE}${CMAKE_BINARY_DIR}/test/data) set(TEST_LAUNCH_HELPER_BINARY ${Z_DRIVE_IF_WINE}${EXECUTABLE_OUTPUT_PATH}/dbus-daemon-launch-helper-test) if (UNIX) diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index dc83f772..b505cc61 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -74,6 +74,7 @@ add_helper_executable(test-service ${test-service_SOURCES} dbus-testutils) add_helper_executable(test-names ${test-names_SOURCES} dbus-testutils) add_test_executable(test-shell ${test-shell_SOURCES} ${DBUS_INTERNAL_LIBRARIES}) add_test_executable(test-printf ${TEST_DIR}/internals/printf.c dbus-testutils) +add_helper_executable(test-privserver ${TEST_DIR}/test-privserver.c dbus-testutils) add_helper_executable(test-shell-service ${test-shell-service_SOURCES} dbus-testutils) add_helper_executable(test-spawn ${test-spawn_SOURCES} ${DBUS_INTERNAL_LIBRARIES}) add_helper_executable(test-exit ${test-exit_SOURCES} ${DBUS_INTERNAL_LIBRARIES}) diff --git a/cmake/test/name-test/CMakeLists.txt b/cmake/test/name-test/CMakeLists.txt index 029b6917..338720df 100644 --- a/cmake/test/name-test/CMakeLists.txt +++ b/cmake/test/name-test/CMakeLists.txt @@ -9,7 +9,6 @@ add_helper_executable(test-pending-call-timeout ${NAME_TEST_DIR}/test-pending-ca add_helper_executable(test-thread-init ${NAME_TEST_DIR}/test-threads-init.c ${DBUS_INTERNAL_LIBRARIES}) add_helper_executable(test-ids ${NAME_TEST_DIR}/test-ids.c ${DBUS_INTERNAL_LIBRARIES}) add_helper_executable(test-shutdown ${NAME_TEST_DIR}/test-shutdown.c dbus-testutils) -add_helper_executable(test-privserver ${NAME_TEST_DIR}/test-privserver.c dbus-testutils) add_helper_executable(test-privserver-client ${NAME_TEST_DIR}/test-privserver-client.c dbus-testutils) add_helper_executable(test-autolaunch ${NAME_TEST_DIR}/test-autolaunch.c dbus-testutils) endif (DBUS_ENABLE_EMBEDDED_TESTS) |