From c23bf2e54d922486254cdd7657aafceaa958ce25 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Mon, 25 Apr 2016 06:43:43 +0200 Subject: [PATCH] Disable failing modules_unittests for UBSan. BUG=webrtc:5820 TBR=pbos@webrtc.org Review URL: https://codereview.webrtc.org/1915813002 . Cr-Commit-Position: refs/heads/master@{#12482} --- .../audio_coding/neteq/neteq_unittest.cc | 6 ++-- .../audio_processing_unittest.cc | 32 ++++++++++++++++--- .../audio_processing/test/debug_dump_test.cc | 4 +++ 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc index b6efe7d7d6..e96e09ab21 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc @@ -514,10 +514,11 @@ void NetEqDecodingTest::PopulateCng(int frame_index, *payload_len = 1; // Only noise level, no spectral parameters. } +// Disabled for UBSan: https://bugs.chromium.org/p/webrtc/issues/detail?id=5820 #if !defined(WEBRTC_IOS) && defined(WEBRTC_NETEQ_UNITTEST_BITEXACT) && \ (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)) && \ defined(WEBRTC_CODEC_ILBC) && defined(WEBRTC_CODEC_G722) && \ - !defined(WEBRTC_ARCH_ARM64) + !defined(WEBRTC_ARCH_ARM64) && !defined(UNDEFINED_SANITIZER) #define MAYBE_TestBitExactness TestBitExactness #else #define MAYBE_TestBitExactness DISABLED_TestBitExactness @@ -552,9 +553,10 @@ TEST_F(NetEqDecodingTest, MAYBE_TestBitExactness) { } } +// Disabled for UBSan: https://bugs.chromium.org/p/webrtc/issues/detail?id=5820 #if !defined(WEBRTC_IOS) && !defined(WEBRTC_ANDROID) && \ defined(WEBRTC_NETEQ_UNITTEST_BITEXACT) && \ - defined(WEBRTC_CODEC_OPUS) + defined(WEBRTC_CODEC_OPUS) && !defined(UNDEFINED_SANITIZER) #define MAYBE_TestOpusBitExactness TestOpusBitExactness #else #define MAYBE_TestOpusBitExactness DISABLED_TestOpusBitExactness diff --git a/webrtc/modules/audio_processing/audio_processing_unittest.cc b/webrtc/modules/audio_processing/audio_processing_unittest.cc index ded75c8652..a5b293eb18 100644 --- a/webrtc/modules/audio_processing/audio_processing_unittest.cc +++ b/webrtc/modules/audio_processing/audio_processing_unittest.cc @@ -1847,17 +1847,35 @@ void ApmTest::VerifyDebugDumpTest(Format format) { remove(limited_filename.c_str()); } -TEST_F(ApmTest, VerifyDebugDumpInt) { +// Disabled for UBSan: https://bugs.chromium.org/p/webrtc/issues/detail?id=5820 +#ifdef UNDEFINED_SANITIZER +#define MAYBE_VerifyDebugDumpInt DISABLED_VerifyDebugDumpInt +#else +#define MAYBE_VerifyDebugDumpInt VerifyDebugDumpInt +#endif +TEST_F(ApmTest, MAYBE_VerifyDebugDumpInt) { VerifyDebugDumpTest(kIntFormat); } -TEST_F(ApmTest, VerifyDebugDumpFloat) { +// Disabled for UBSan: https://bugs.chromium.org/p/webrtc/issues/detail?id=5820 +#ifdef UNDEFINED_SANITIZER +#define MAYBE_VerifyDebugDumpFloat DISABLED_VerifyDebugDumpFloat +#else +#define MAYBE_VerifyDebugDumpFloat VerifyDebugDumpFloat +#endif +TEST_F(ApmTest, MAYBE_VerifyDebugDumpFloat) { VerifyDebugDumpTest(kFloatFormat); } #endif // TODO(andrew): expand test to verify output. -TEST_F(ApmTest, DebugDump) { +// Disabled for UBSan: https://bugs.chromium.org/p/webrtc/issues/detail?id=5820 +#ifdef UNDEFINED_SANITIZER +#define MAYBE_DebugDump DISABLED_DebugDump +#else +#define MAYBE_DebugDump DebugDump +#endif +TEST_F(ApmTest, MAYBE_DebugDump) { const std::string filename = test::TempFilename(test::OutputPath(), "debug_aec"); EXPECT_EQ(apm_->kNullPointerError, @@ -1890,7 +1908,13 @@ TEST_F(ApmTest, DebugDump) { } // TODO(andrew): expand test to verify output. -TEST_F(ApmTest, DebugDumpFromFileHandle) { +// Disabled for UBSan: https://bugs.chromium.org/p/webrtc/issues/detail?id=5820 +#ifdef UNDEFINED_SANITIZER +#define MAYBE_DebugDumpFromFileHandle DISABLED_DebugDumpFromFileHandle +#else +#define MAYBE_DebugDumpFromFileHandle DebugDumpFromFileHandle +#endif +TEST_F(ApmTest, MAYBE_DebugDumpFromFileHandle) { FILE* fid = NULL; EXPECT_EQ(apm_->kNullPointerError, apm_->StartDebugRecording(fid, -1)); const std::string filename = diff --git a/webrtc/modules/audio_processing/test/debug_dump_test.cc b/webrtc/modules/audio_processing/test/debug_dump_test.cc index 3acb69444d..f68c175e5d 100644 --- a/webrtc/modules/audio_processing/test/debug_dump_test.cc +++ b/webrtc/modules/audio_processing/test/debug_dump_test.cc @@ -262,6 +262,8 @@ void DebugDumpTest::VerifyDebugDump(const std::string& in_filename) { } } +// Disabled for UBSan: https://bugs.chromium.org/p/webrtc/issues/detail?id=5820 +#ifndef UNDEFINED_SANITIZER TEST_F(DebugDumpTest, SimpleCase) { Config config; DebugDumpGenerator generator(config); @@ -525,5 +527,7 @@ TEST_F(DebugDumpTest, TransientSuppressionOn) { VerifyDebugDump(generator.dump_file_name()); } +#endif // !UNDEFINED_SANITIZER + } // namespace test } // namespace webrtc