Revert "Re-enable disabled tests under TSan."

This reverts commit df9ce12259a4e866feeb580d2e0cf9648f60d3b5.

Reason for revert:

Re-enabled tests still fail tsan in high bitdepth.

Original change's description:
> Re-enable disabled tests under TSan.
>
> These tests point to an already-fixed bug, this should no longer have a
> data race.
>
> BUG=webm:1049
>
> Change-Id: Iaedc5db8df99362bdc501b70ff7fdebf8756fdb8

TBR=jzern@google.com,pbos@chromium.org,builds@webmproject.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: webm:1049
Change-Id: I232f1f7726bf795b301abfb2e07cad6756642e53

diff --git a/test/datarate_test.cc b/test/datarate_test.cc
index a88f786c1d5da432f3da54f2c50d3f8401731ca2..8e93de6b9ccefdb9d040169e0c8bc58e2f7f1051 100644 (file)
--- a/test/datarate_test.cc
+++ b/test/datarate_test.cc
@@ -258,6 +258,14 @@ TEST_P(DatarateTestLarge, ChangingDropFrameThresh) {
   }
 }
 
+// Disabled for tsan, see:
+// https://bugs.chromium.org/p/webm/issues/detail?id=1049
+#if defined(__has_feature)
+#if __has_feature(thread_sanitizer)
+#define BUILDING_WITH_TSAN
+#endif
+#endif
+#ifndef BUILDING_WITH_TSAN
 TEST_P(DatarateTestLarge, DropFramesMultiThreads) {
   denoiser_on_ = 0;
   cfg_.rc_buf_initial_sz = 500;
@@ -277,6 +285,7 @@ TEST_P(DatarateTestLarge, DropFramesMultiThreads) {
   ASSERT_LE(cfg_.rc_target_bitrate, file_datarate_ * 1.4)
       << " The datarate for the file missed the target!";
 }
+#endif  // !BUILDING_WITH_TSAN
 
 class DatarateTestRealTime : public DatarateTestLarge {
  public:
@@ -393,6 +402,10 @@ TEST_P(DatarateTestRealTime, ChangingDropFrameThresh) {
   }
 }
 
+// Disabled for tsan, see:
+// https://bugs.chromium.org/p/webm/issues/detail?id=1049
+
+#ifndef BUILDING_WITH_TSAN
 TEST_P(DatarateTestRealTime, DropFramesMultiThreads) {
   denoiser_on_ = 0;
   cfg_.rc_buf_initial_sz = 500;
@@ -413,6 +426,7 @@ TEST_P(DatarateTestRealTime, DropFramesMultiThreads) {
   ASSERT_LE(cfg_.rc_target_bitrate, file_datarate_ * 1.4)
       << " The datarate for the file missed the target!";
 }
+#endif
 
 TEST_P(DatarateTestRealTime, GFBoost) {
   denoiser_on_ = 0;