From: Simon McVittie Date: Tue, 7 Jan 2014 12:23:10 +0000 (+0000) Subject: tests: don't block and wait for a debugger on abort X-Git-Tag: dbus-1.8.0~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7457a4401188b50e30dccd2f99db9c6289d080a1;p=thirdparty%2Fdbus.git 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 --- diff --git a/cmake/modules/Macros.cmake b/cmake/modules/Macros.cmake index 9a1519d63..545f2e587 100644 --- 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 426a72e01..09b945618 100644 --- 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 \