Revert of Disable failing modules_unittests for UBSan. (patchset #1 id:40001 of https://codereview.webrtc.org/1915813002/ )
Reason for revert:
Fix upstream should've landed in our repository.
Original issue's description:
> Disable failing modules_unittests for UBSan.
>
> BUG=webrtc:5820
> TBR=pbos@webrtc.org
>
> Committed: https://crrev.com/c23bf2e54d922486254cdd7657aafceaa958ce25
> Cr-Commit-Position: refs/heads/master@{#12482}
TBR=kjellander@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:5820
Review-Url: https://codereview.webrtc.org/1937153002
Cr-Commit-Position: refs/heads/master@{#12647}
diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc
index ad7a201..69c3876 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc
@@ -446,11 +446,10 @@
*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(UNDEFINED_SANITIZER)
+ !defined(WEBRTC_ARCH_ARM64)
#define MAYBE_TestBitExactness TestBitExactness
#else
#define MAYBE_TestBitExactness DISABLED_TestBitExactness
@@ -484,10 +483,9 @@
FLAGS_gen_ref);
}
-// 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(UNDEFINED_SANITIZER)
+ defined(WEBRTC_CODEC_OPUS)
#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 a5b293e..ded75c8 100644
--- a/webrtc/modules/audio_processing/audio_processing_unittest.cc
+++ b/webrtc/modules/audio_processing/audio_processing_unittest.cc
@@ -1847,35 +1847,17 @@
remove(limited_filename.c_str());
}
-// 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) {
+TEST_F(ApmTest, VerifyDebugDumpInt) {
VerifyDebugDumpTest(kIntFormat);
}
-// 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) {
+TEST_F(ApmTest, VerifyDebugDumpFloat) {
VerifyDebugDumpTest(kFloatFormat);
}
#endif
// TODO(andrew): expand test to verify output.
-// 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) {
+TEST_F(ApmTest, DebugDump) {
const std::string filename =
test::TempFilename(test::OutputPath(), "debug_aec");
EXPECT_EQ(apm_->kNullPointerError,
@@ -1908,13 +1890,7 @@
}
// TODO(andrew): expand test to verify output.
-// 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) {
+TEST_F(ApmTest, 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 b61b7b3..64d659e 100644
--- a/webrtc/modules/audio_processing/test/debug_dump_test.cc
+++ b/webrtc/modules/audio_processing/test/debug_dump_test.cc
@@ -263,8 +263,6 @@
}
}
-// 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);
@@ -528,7 +526,5 @@
VerifyDebugDump(generator.dump_file_name());
}
-#endif // !UNDEFINED_SANITIZER
-
} // namespace test
} // namespace webrtc