diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-30 16:20:51 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-30 16:20:51 +0000 |
| commit | cc6edb9a113e890b173a84d779ce620770ec9b20 (patch) | |
| tree | a729e89e4bccf5827ba5424ff0bdd6cafcc8f92b | |
| parent | acb3ced454d545e1769906183b7a3043958cbfc0 (diff) | |
| download | chromium_src-cc6edb9a113e890b173a84d779ce620770ec9b20.zip chromium_src-cc6edb9a113e890b173a84d779ce620770ec9b20.tar.gz chromium_src-cc6edb9a113e890b173a84d779ce620770ec9b20.tar.bz2 | |
Disable Webrtc(AecDump)BrowserTest.CallWithAecDump on Windows.
TBR=tommi@chromium.org
BUG=331035
Review URL: https://codereview.chromium.org/116083007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242719 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/media/webrtc_aecdump_browsertest.cc | 3 | ||||
| -rw-r--r-- | content/browser/media/webrtc_browsertest.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/content/browser/media/webrtc_aecdump_browsertest.cc b/content/browser/media/webrtc_aecdump_browsertest.cc index bda90c9..0c52232 100644 --- a/content/browser/media/webrtc_aecdump_browsertest.cc +++ b/content/browser/media/webrtc_aecdump_browsertest.cc @@ -65,8 +65,9 @@ class WebrtcAecDumpBrowserTest : public ContentBrowserTest { DISALLOW_COPY_AND_ASSIGN(WebrtcAecDumpBrowserTest); }; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) +#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)) // Timing out on ARM linux bot: http://crbug.com/238490 +// Failing on Windows: http://crbug.com/331035 #define MAYBE_CallWithAecDump DISABLED_CallWithAecDump #else #define MAYBE_CallWithAecDump CallWithAecDump diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc index af7b087..9778918 100644 --- a/content/browser/media/webrtc_browsertest.cc +++ b/content/browser/media/webrtc_browsertest.cc @@ -816,8 +816,9 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, ExpectTitle("OK"); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) +#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)) // Timing out on ARM linux bot: http://crbug.com/238490 +// Failing on Windows: http://crbug.com/331035 #define MAYBE_CallWithAecDump DISABLED_CallWithAecDump #else #define MAYBE_CallWithAecDump CallWithAecDump |