From: Simon McVittie <smcv@debian.org>
Date: Tue, 24 Nov 2015 01:19:55 +0000 (+0000)
Subject: cmake: run all automated tests with --tap for better diagnostics
X-Git-Tag: dbus-1.11.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c3034f1250b4bd58c8619b0900dbf9795ad53bc;p=thirdparty%2Fdbus.git

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>
---

diff --git a/cmake/modules/Macros.cmake b/cmake/modules/Macros.cmake
index fd3f62c4a..8d6cf11f3 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")