diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-07 12:23:10 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2014-01-10 01:36:16 +0100 |
| commit | 7457a4401188b50e30dccd2f99db9c6289d080a1 (patch) | |
| tree | 299f4bad36088f3d24af742c0fc832039ea7c059 | |
| parent | 8e728f36d19b52d083680e618aa57171e828c5cd (diff) | |
| download | dbus-7457a4401188b50e30dccd2f99db9c6289d080a1.tar.gz | |
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>
| -rw-r--r-- | cmake/modules/Macros.cmake | 1 | ||||
| -rw-r--r-- | test/Makefile.am | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/cmake/modules/Macros.cmake b/cmake/modules/Macros.cmake index 9a1519d6..545f2e58 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 426a72e0..09b94561 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 \ |