Commit 99121421 authored by shadi@chromium.org's avatar shadi@chromium.org

Disable failing tests for WV key system running with test license server.

crbug/349398: Disabled Widevine test license server on precise 32 bit.
crbug/349526: Disabled two failing tests on precise 64 bit.

BUG=349526,349398

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255198 0039d316-1c4b-4281-b951-d872f2087c98
parent 28b1aa8b
...@@ -414,10 +414,22 @@ INSTANTIATE_TEST_CASE_P(MSE_Widevine, EncryptedMediaTest, ...@@ -414,10 +414,22 @@ INSTANTIATE_TEST_CASE_P(MSE_Widevine, EncryptedMediaTest,
#endif // defined(WIDEVINE_CDM_AVAILABLE) #endif // defined(WIDEVINE_CDM_AVAILABLE)
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM) { IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM) {
#if defined(WIDEVINE_CDM_AVAILABLE)
if (IsWidevine(CurrentKeySystem())) {
VLOG(0) << "Test disabled on Widevine key system, crbug.com/349526.";
return;
}
#endif
TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly); TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly);
} }
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioClearVideo_WebM) { IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioClearVideo_WebM) {
#if defined(WIDEVINE_CDM_AVAILABLE)
if (IsWidevine(CurrentKeySystem())) {
VLOG(0) << "Test disabled on Widevine key system, crbug.com/349526.";
return;
}
#endif
TestSimplePlayback("bear-320x240-av-enc_a.webm", kWebMAudioVideo); TestSimplePlayback("bear-320x240-av-enc_a.webm", kWebMAudioVideo);
} }
......
...@@ -120,7 +120,7 @@ bool WVTestLicenseServerConfig::SelectServerPort() { ...@@ -120,7 +120,7 @@ bool WVTestLicenseServerConfig::SelectServerPort() {
} }
bool WVTestLicenseServerConfig::IsPlatformSupported() { bool WVTestLicenseServerConfig::IsPlatformSupported() {
#if defined(OS_LINUX) #if defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
return true; return true;
#else #else
return false; return false;
......
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