diff options
| author | rmcilroy <rmcilroy@chromium.org> | 2014-09-26 14:59:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-26 22:00:09 +0000 |
| commit | 2d00e9e85555a42000205dab41284bca5a28a579 (patch) | |
| tree | 8d3f73f07eff8e99e3aead7c768a47188980d942 | |
| parent | 9a5d1544434f81316604dc8b35fb6380d0d5a773 (diff) | |
| download | chromium_src-2d00e9e85555a42000205dab41284bca5a28a579.zip chromium_src-2d00e9e85555a42000205dab41284bca5a28a579.tar.gz chromium_src-2d00e9e85555a42000205dab41284bca5a28a579.tar.bz2 | |
Disable EncryptedMediaTests on Arm64 Android due to Timeouts.
BUG=418039
Review URL: https://codereview.chromium.org/612453002
Cr-Commit-Position: refs/heads/master@{#297046}
| -rw-r--r-- | content/browser/media/encrypted_media_browsertest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc index c049d30..1069537 100644 --- a/content/browser/media/encrypted_media_browsertest.cc +++ b/content/browser/media/encrypted_media_browsertest.cc @@ -92,6 +92,10 @@ class EncryptedMediaTest : public content::MediaBrowserTest, const std::string& key_system, SrcType src_type, const std::string& expectation) { +#if defined(OS_ANDROID) && defined(__aarch64__) + // Disable EME tests on arm64 due to timeouts: http://crbug.com/418039 + return; +#endif if (src_type == MSE && !IsMSESupported()) { VLOG(0) << "Skipping test - MSE not supported."; return; @@ -175,9 +179,6 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) { #if defined(OS_WIN) if (base::win::GetVersion() < base::win::VERSION_VISTA) return; -#elif defined(__aarch64__) - // Times out on arm64 currently due to http://crbug.com/403308 - return; #endif TestFrameSizeChange(); } |