diff options
Diffstat (limited to 'test/name-test')
-rw-r--r-- | test/name-test/CMakeLists.txt | 10 | ||||
-rw-r--r-- | test/name-test/Makefile.am | 9 |
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 |