summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmake/modules/Macros.cmake1
-rw-r--r--test/Makefile.am1
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 \