summaryrefslogtreecommitdiff
path: root/test/name-test
diff options
context:
space:
mode:
authorTopi Miettinen <toiwoton@gmail.com>2019-03-23 22:18:11 +0200
committerTopi Miettinen <toiwoton@gmail.com>2019-03-25 21:51:33 +0200
commit94b5b236aa0743bacb2139c62d5a6e0143845634 (patch)
treee831a75a07afd47bc9fcfb140595de56c193e431 /test/name-test
parentdf9cb47c3aa28a385bd6254b80f1e55c66321071 (diff)
downloaddbus-94b5b236aa0743bacb2139c62d5a6e0143845634.tar.gz
Configure option to disable traditional activation
Traditional activation could be disabled if all services use SystemdService activation instead. Provide an example of a hardened DBus systemd service drop-in file for such a setup. Signed-off-by: Topi Miettinen <toiwoton@gmail.com>
Diffstat (limited to 'test/name-test')
-rw-r--r--test/name-test/CMakeLists.txt10
-rw-r--r--test/name-test/Makefile.am9
2 files changed, 14 insertions, 5 deletions
diff --git a/test/name-test/CMakeLists.txt b/test/name-test/CMakeLists.txt
index dabf892a..32f060a2 100644
--- a/test/name-test/CMakeLists.txt
+++ b/test/name-test/CMakeLists.txt
@@ -6,8 +6,12 @@ add_helper_executable(test-autolaunch test-autolaunch.c dbus-testutils)
add_helper_executable(test-privserver-client test-privserver-client.c dbus-testutils)
add_session_test_executable(test-ids test-ids.c ${DBUS_INTERNAL_LIBRARIES})
-add_session_test_executable(test-pending-call-dispatch test-pending-call-dispatch.c ${DBUS_INTERNAL_LIBRARIES})
-add_session_test_executable(test-pending-call-timeout test-pending-call-timeout.c ${DBUS_INTERNAL_LIBRARIES})
+if (ENABLE_TRADITIONAL_ACTIVATION)
+ add_session_test_executable(test-pending-call-dispatch test-pending-call-dispatch.c ${DBUS_INTERNAL_LIBRARIES})
+ add_session_test_executable(test-pending-call-timeout test-pending-call-timeout.c ${DBUS_INTERNAL_LIBRARIES})
+endif()
add_session_test_executable(test-shutdown test-shutdown.c dbus-testutils)
-add_session_test_executable(test-thread-init test-threads-init.c ${DBUS_INTERNAL_LIBRARIES})
+if (ENABLE_TRADITIONAL_ACTIVATION)
+ add_session_test_executable(test-thread-init test-threads-init.c ${DBUS_INTERNAL_LIBRARIES})
+endif()
endif()
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am
index bffe679a..81938778 100644
--- a/test/name-test/Makefile.am
+++ b/test/name-test/Makefile.am
@@ -51,15 +51,20 @@ TESTS += \
run-test.sh \
run-test-systemserver.sh \
test-ids \
+ test-pending-call-disconnected \
+ test-shutdown \
+ $(NULL)
+
+if ENABLE_TRADITIONAL_ACTIVATION
+TESTS += \
test-pending-call-dispatch \
test-pending-call-timeout \
- test-pending-call-disconnected \
test-privserver-client \
- test-shutdown \
test-threads-init \
$(NULL)
endif
endif
+endif
EXTRA_DIST=run-test.sh run-test-systemserver.sh