From 94b5b236aa0743bacb2139c62d5a6e0143845634 Mon Sep 17 00:00:00 2001 From: Topi Miettinen Date: Sat, 23 Mar 2019 22:18:11 +0200 Subject: 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 --- test/name-test/CMakeLists.txt | 10 +++++++--- test/name-test/Makefile.am | 9 +++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'test/name-test') 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 -- cgit v1.2.1