From ee0550cc4e7fceb07e40abdf0f0e6cc4fdb7e788 Mon Sep 17 00:00:00 2001 From: Yves Gerey Date: Wed, 17 Jul 2019 21:41:59 +0200 Subject: [PATCH] [Unit tests] Show skipped tests instead of painting them green. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Marking test as skipped is more honest than pretending it is successful! Prevent confusion like in the following scenario for one given test: - ubsan: launched and sometimes failing. - tsan: never launched but always flagged OK. Bug: webrtc:9778 Change-Id: Ie0be0759347eabd3c9d29dd5ea2de809511d1b97 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/145980 Reviewed-by: Henrik Andreassson Reviewed-by: Sami Kalliomäki Commit-Queue: Yves Gerey Cr-Commit-Position: refs/heads/master@{#28597} --- modules/audio_device/audio_device_unittest.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/audio_device/audio_device_unittest.cc b/modules/audio_device/audio_device_unittest.cc index 8dab1c74e9..361d2ce799 100644 --- a/modules/audio_device/audio_device_unittest.cc +++ b/modules/audio_device/audio_device_unittest.cc @@ -69,19 +69,19 @@ namespace { // Don't run these tests in combination with sanitizers. // TODO(webrtc:9778): Re-enable on THREAD_SANITIZER? -#if !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER) && \ - !defined(THREAD_SANITIZER) +#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \ + defined(THREAD_SANITIZER) #define SKIP_TEST_IF_NOT(requirements_satisfied) \ do { \ - if (!requirements_satisfied) { \ - return; \ - } \ + GTEST_SKIP() << "Skipped for sanitizers."; \ } while (false) #else // Or if other audio-related requirements are not met. -#define SKIP_TEST_IF_NOT(requirements_satisfied) \ - do { \ - return; \ +#define SKIP_TEST_IF_NOT(requirements_satisfied) \ + do { \ + if (!requirements_satisfied) { \ + GTEST_SKIP() << "Skipped. No audio device found."; \ + } \ } while (false) #endif