tests: don't block and wait for a debugger on abort

In general, I think developers running the tests would expect
them to terminate rather than hanging. Developers who want to debug
such an abort by attaching a debugger to a live process can still set
DBUS_BLOCK_ON_ABORT in the environment.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>

diff --git a/cmake/modules/Macros.cmake b/cmake/modules/Macros.cmake
index 9a1519d63a8f295f572453ddb4c1eed6a46e7ab5..545f2e587841874b2e30a962561e8579d7b7c5f1 100644 (file)
--- a/cmake/modules/Macros.cmake
+++ b/cmake/modules/Macros.cmake
@@ -25,7 +25,6 @@ macro(add_test_executable _target _source)
     endif()
     list(APPEND _env "DBUS_SESSION_BUS_ADDRESS=")
     list(APPEND _env "DBUS_FATAL_WARNINGS=1")
-    list(APPEND _env "DBUS_BLOCK_ON_ABORT=1")
     list(APPEND _env "DBUS_TEST_DATA=${PREFIX}${CMAKE_BINARY_DIR}/test/data")
     list(APPEND _env "DBUS_TEST_HOMEDIR=${PREFIX}${CMAKE_BINARY_DIR}/dbus")
     set_tests_properties(${_target} PROPERTIES ENVIRONMENT "${_env}")

diff --git a/test/Makefile.am b/test/Makefile.am
index 426a72e01ace32ee9105331b228a89ccfc139dd3..09b94561869ff1a34de57d639f6edf3156ddf30c 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -156,7 +156,6 @@ installcheck_environment = \
 
 TESTS_ENVIRONMENT = \
        XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR \
-       DBUS_BLOCK_ON_ABORT=1 \
        DBUS_FATAL_WARNINGS=1 \
        DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \
        DBUS_TEST_DATA=@abs_top_builddir@/test/data \