Commit 2d00e9e8 authored by rmcilroy's avatar rmcilroy Committed by Commit bot

Disable EncryptedMediaTests on Arm64 Android due to Timeouts.

BUG=418039

Review URL: https://codereview.chromium.org/612453002

Cr-Commit-Position: refs/heads/master@{#297046}
parent 9a5d1544
...@@ -92,6 +92,10 @@ class EncryptedMediaTest : public content::MediaBrowserTest, ...@@ -92,6 +92,10 @@ class EncryptedMediaTest : public content::MediaBrowserTest,
const std::string& key_system, const std::string& key_system,
SrcType src_type, SrcType src_type,
const std::string& expectation) { 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()) { if (src_type == MSE && !IsMSESupported()) {
VLOG(0) << "Skipping test - MSE not supported."; VLOG(0) << "Skipping test - MSE not supported.";
return; return;
...@@ -175,9 +179,6 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) { ...@@ -175,9 +179,6 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
#if defined(OS_WIN) #if defined(OS_WIN)
if (base::win::GetVersion() < base::win::VERSION_VISTA) if (base::win::GetVersion() < base::win::VERSION_VISTA)
return; return;
#elif defined(__aarch64__)
// Times out on arm64 currently due to http://crbug.com/403308
return;
#endif #endif
TestFrameSizeChange(); TestFrameSizeChange();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment