Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: content/browser/media/webrtc_browsertest.cc

Issue 506423002: Disable some WebRtcBrowserTests under TSAN v2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/process/process_handle.h" 7 #include "base/process/process_handle.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/threading/platform_thread.h" 10 #include "base/threading/platform_thread.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 // Always force iSAC 16K on Android for now (Opus is broken). 97 // Always force iSAC 16K on Android for now (Opus is broken).
98 EXPECT_EQ("isac-forced", 98 EXPECT_EQ("isac-forced",
99 ExecuteJavascriptAndReturnResult("forceIsac16KInSdp();")); 99 ExecuteJavascriptAndReturnResult("forceIsac16KInSdp();"));
100 #endif 100 #endif
101 } 101 }
102 }; 102 };
103 103
104 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) 104 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
105 // Timing out on ARM linux bot: http://crbug.com/238490 105 // Timing out on ARM linux bot: http://crbug.com/238490
106 #define MAYBE_CanSetupDefaultVideoCall DISABLED_CanSetupDefaultVideoCall 106 #define MAYBE_CanSetupDefaultVideoCall DISABLED_CanSetupDefaultVideoCall
107 // Flaky on TSAN v2. http://crbug.com/408006
108 #elif defined(THREAD_SANITIZER)
109 #define MAYBE_CanSetupDefaultVideoCall DISABLED_CanSetupDefaultVideoCall
107 #else 110 #else
108 #define MAYBE_CanSetupDefaultVideoCall CanSetupDefaultVideoCall 111 #define MAYBE_CanSetupDefaultVideoCall CanSetupDefaultVideoCall
109 #endif 112 #endif
110 113
111 // These tests will make a complete PeerConnection-based call and verify that 114 // These tests will make a complete PeerConnection-based call and verify that
112 // video is playing for the call. 115 // video is playing for the call.
113 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MAYBE_CanSetupDefaultVideoCall) { 116 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MAYBE_CanSetupDefaultVideoCall) {
114 MakeTypicalPeerConnectionCall( 117 MakeTypicalPeerConnectionCall(
115 "callAndExpectResolution({video: true}, 640, 480);"); 118 "callAndExpectResolution({video: true}, 640, 480);");
116 } 119 }
117 120
121 // Flaky on TSAN v2. http://crbug.com/408006
122 #if defined(THREAD_SANITIZER)
123 #define MAYBE_CanSetupVideoCallWith1To1AspectRatio \
124 DISABLED_CanSetupVideoCallWith1To1AspectRatio
125 #else
126 #define MAYBE_CanSetupVideoCallWith1To1AspectRatio \
127 CanSetupVideoCallWith1To1AspectRatio
128 #endif
118 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, 129 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
119 CanSetupVideoCallWith1To1AspectRatio) { 130 MAYBE_CanSetupVideoCallWith1To1AspectRatio) {
120 const std::string javascript = 131 const std::string javascript =
121 "callAndExpectResolution({video: {mandatory: {minWidth: 320," 132 "callAndExpectResolution({video: {mandatory: {minWidth: 320,"
122 " maxWidth: 320, minHeight: 320, maxHeight: 320}}}, 320, 320);"; 133 " maxWidth: 320, minHeight: 320, maxHeight: 320}}}, 320, 320);";
123 MakeTypicalPeerConnectionCall(javascript); 134 MakeTypicalPeerConnectionCall(javascript);
124 } 135 }
125 136
137 // Flaky on TSAN v2. http://crbug.com/408006
138 #if defined(THREAD_SANITIZER)
139 #define MAYBE_CanSetupVideoCallWith16To9AspectRatio \
140 DISABLED_CanSetupVideoCallWith16To9AspectRatio
141 #else
142 #define MAYBE_CanSetupVideoCallWith16To9AspectRatio \
143 CanSetupVideoCallWith16To9AspectRatio
144 #endif
126 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, 145 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
127 CanSetupVideoCallWith16To9AspectRatio) { 146 MAYBE_CanSetupVideoCallWith16To9AspectRatio) {
128 const std::string javascript = 147 const std::string javascript =
129 "callAndExpectResolution({video: {mandatory: {minWidth: 640," 148 "callAndExpectResolution({video: {mandatory: {minWidth: 640,"
130 " maxWidth: 640, minAspectRatio: 1.777}}}, 640, 360);"; 149 " maxWidth: 640, minAspectRatio: 1.777}}}, 640, 360);";
131 MakeTypicalPeerConnectionCall(javascript); 150 MakeTypicalPeerConnectionCall(javascript);
132 } 151 }
133 152
153 // Flaky on TSAN v2. http://crbug.com/408006
154 #if defined(THREAD_SANITIZER)
155 #define MAYBE_CanSetupVideoCallWith4To3AspectRatio \
156 DISABLED_CanSetupVideoCallWith4To3AspectRatio
157 #else
158 #define MAYBE_CanSetupVideoCallWith4To3AspectRatio \
159 CanSetupVideoCallWith4To3AspectRatio
160 #endif
134 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, 161 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
135 CanSetupVideoCallWith4To3AspectRatio) { 162 MAYBE_CanSetupVideoCallWith4To3AspectRatio) {
136 const std::string javascript = 163 const std::string javascript =
137 "callAndExpectResolution({video: {mandatory: {minWidth: 960," 164 "callAndExpectResolution({video: {mandatory: {minWidth: 960,"
138 "maxAspectRatio: 1.333}}}, 960, 720);"; 165 "maxAspectRatio: 1.333}}}, 960, 720);";
139 MakeTypicalPeerConnectionCall(javascript); 166 MakeTypicalPeerConnectionCall(javascript);
140 } 167 }
141 168
142 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) 169 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
143 // Timing out on ARM linux, see http://crbug.com/240376 170 // Timing out on ARM linux, see http://crbug.com/240376
144 #define MAYBE_CanSetupAudioAndVideoCall DISABLED_CanSetupAudioAndVideoCall 171 #define MAYBE_CanSetupAudioAndVideoCall DISABLED_CanSetupAudioAndVideoCall
145 #else 172 #else
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 587
561 base::DeleteFile(unique_dump_file, false); 588 base::DeleteFile(unique_dump_file, false);
562 } 589 }
563 } 590 }
564 591
565 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, CreateOfferWithOfferOptions) { 592 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, CreateOfferWithOfferOptions) {
566 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); 593 MakeTypicalPeerConnectionCall("testCreateOfferOptions();");
567 } 594 }
568 595
569 } // namespace content 596 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698