summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2015-11-24 01:19:55 +0000
committerSimon McVittie <smcv@debian.org>2015-12-02 18:51:08 +0000
commit085f9348a1672107a4f0299d70464887b40731e4 (patch)
tree160dc338763e8a19d4998ea4f5635f2ed1c2fa7c
parentae533ae9b9e3b0b527cc06879755d6b944141060 (diff)
downloaddbus-085f9348a1672107a4f0299d70464887b40731e4.tar.gz
cmake: run all automated tests with --tap for better diagnostics
For GLib-based tests it's useful, because it means g_test_message() gets logged. For the embedded tests it's now accepted and ignored. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=93194 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
-rw-r--r--cmake/modules/Macros.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/modules/Macros.cmake b/cmake/modules/Macros.cmake
index fd3f62c4..8d6cf11f 100644
--- a/cmake/modules/Macros.cmake
+++ b/cmake/modules/Macros.cmake
@@ -43,11 +43,11 @@ macro(add_test_executable _target _source)
# run tests with binfmt_misc
set(PREFIX "z:")
set(_env "DBUS_TEST_DAEMON=${PREFIX}${CMAKE_BINARY_DIR}/bin/dbus-daemon${EXEEXT}")
- add_test(NAME ${_target} COMMAND $<TARGET_FILE:${_target}>)
+ add_test(NAME ${_target} COMMAND $<TARGET_FILE:${_target}> --tap)
else()
set(PREFIX)
set(_env "DBUS_TEST_DAEMON=${CMAKE_BINARY_DIR}/bin/dbus-daemon${EXEEXT}")
- add_test(NAME ${_target} COMMAND $<TARGET_FILE:${_target}>)
+ add_test(NAME ${_target} COMMAND $<TARGET_FILE:${_target}> --tap)
endif()
list(APPEND _env "DBUS_SESSION_BUS_ADDRESS=")
list(APPEND _env "DBUS_FATAL_WARNINGS=1")