summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2018-09-28 16:27:42 +0100
committerSimon McVittie <smcv@collabora.com>2019-01-21 15:20:22 +0000
commit9feeeaea9a9afb9bb8aa2a2d4eefb3e909026674 (patch)
tree253ca13d73f5237e6cd1af4a70fcc08aec1c4cd3 /cmake
parentb4b0e1b3f57341b140f6542b98ded8b13d35706d (diff)
downloaddbus-9feeeaea9a9afb9bb8aa2a2d4eefb3e909026674.tar.gz
test: Move auth, credentials tests from libdbus-internal into test/
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/dbus/CMakeLists.txt4
-rw-r--r--cmake/test/CMakeLists.txt8
2 files changed, 7 insertions, 5 deletions
diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index 29b73b43..2931415e 100644
--- a/cmake/dbus/CMakeLists.txt
+++ b/cmake/dbus/CMakeLists.txt
@@ -152,9 +152,6 @@ set (DBUS_SHARED_HEADERS
### to be unless they move to DBUS_SHARED_SOURCES later)
set (DBUS_UTIL_SOURCES
${DBUS_DIR}/dbus-asv-util.c
- ${DBUS_DIR}/dbus-auth-script.c
- ${DBUS_DIR}/dbus-auth-util.c
- ${DBUS_DIR}/dbus-credentials-util.c
${DBUS_DIR}/dbus-mainloop.c
${DBUS_DIR}/dbus-marshal-byteswap-util.c
${DBUS_DIR}/dbus-marshal-recursive-util.c
@@ -170,7 +167,6 @@ set (DBUS_UTIL_SOURCES
set (DBUS_UTIL_HEADERS
${DBUS_DIR}/dbus-asv-util.h
- ${DBUS_DIR}/dbus-auth-script.h
${DBUS_DIR}/dbus-mainloop.h
${DBUS_DIR}/dbus-message-factory.h
${DBUS_DIR}/dbus-shell.h
diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index ff70fc2c..32efb2c7 100644
--- a/cmake/test/CMakeLists.txt
+++ b/cmake/test/CMakeLists.txt
@@ -102,7 +102,13 @@ if(DBUS_ENABLE_EMBEDDED_TESTS)
add_test_executable(test-message-internals ${TEST_DIR}/internals/message-internals.c dbus-testutils)
set_target_properties(test-message-internals PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
- add_test_executable(test-misc-internals ${TEST_DIR}/internals/misc-internals.c dbus-testutils)
+ set(SOURCES ${TEST_DIR}/internals/dbus-auth-script.c
+ ${TEST_DIR}/internals/dbus-auth-script.h
+ ${TEST_DIR}/internals/dbus-auth-util.c
+ ${TEST_DIR}/internals/dbus-credentials-util.c
+ ${TEST_DIR}/internals/misc-internals.c
+ ${TEST_DIR}/internals/misc-internals.h)
+ add_test_executable(test-misc-internals "${SOURCES}" dbus-testutils)
set_target_properties(test-misc-internals PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
set(SOURCES ${TEST_DIR}/bus/main.c)