diff options
| author | vabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-05 16:20:55 +0000 |
|---|---|---|
| committer | vabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-05 16:20:55 +0000 |
| commit | 3d349cc23f9ce48530d2b8e8888d2f70e52e6cb6 (patch) | |
| tree | d248336dff3b755914f7aa318ca43d164e9d1d69 /content | |
| parent | dadbe974bba4c8cc780b6aa96cdb550bdaac3c7a (diff) | |
| download | chromium_src-3d349cc23f9ce48530d2b8e8888d2f70e52e6cb6.zip chromium_src-3d349cc23f9ce48530d2b8e8888d2f70e52e6cb6.tar.gz chromium_src-3d349cc23f9ce48530d2b8e8888d2f70e52e6cb6.tar.bz2 | |
Disable some EncryptedMediaTests
Those, for which "assertion `GTK_IS_WIDGET (widget)' failed" on Linux Debug.
BUG=174294
TBR=shadi@chromium.org
Review URL: https://codereview.chromium.org/12223005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/media/encrypted_media_browsertest.cc | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc index 45bd912..77e15a0 100644 --- a/content/browser/media/encrypted_media_browsertest.cc +++ b/content/browser/media/encrypted_media_browsertest.cc @@ -125,35 +125,67 @@ IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) { "com.example.invalid", kExpected)); } +#if defined(OS_LINUX) && !defined(NDEBUG) +// http://crbug.com/174294; not using MAYBE_ because IN_PROC_BROWSER_TEST_P does +// not expand the test name macro correctly, TODO(vabr, bauerb) +IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback_AudioOnly) { +#else IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_AudioOnly) { +#endif const string16 kExpected = ASCIIToUTF16("ENDED"); ASSERT_NO_FATAL_FAILURE( TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly, GetParam(), kExpected)); } +#if defined(OS_LINUX) && !defined(NDEBUG) +// http://crbug.com/174294; not using MAYBE_ because IN_PROC_BROWSER_TEST_P does +// not expand the test name macro correctly, TODO(vabr, bauerb) +IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, + DISABLED_BasicPlayback_AudioClearVideo) { +#else IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_AudioClearVideo) { +#endif const string16 kExpected = ASCIIToUTF16("ENDED"); ASSERT_NO_FATAL_FAILURE( TestSimplePlayback("bear-320x240-av-enc_a.webm", kWebMAudioVideo, GetParam(), kExpected)); } +#if defined(OS_LINUX) && !defined(NDEBUG) +// http://crbug.com/174294; not using MAYBE_ because IN_PROC_BROWSER_TEST_P does +// not expand the test name macro correctly, TODO(vabr, bauerb) +IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback_VideoAudio) { +#else IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoAudio) { +#endif const string16 kExpected = ASCIIToUTF16("ENDED"); ASSERT_NO_FATAL_FAILURE( TestSimplePlayback("bear-320x240-av-enc_av.webm", kWebMAudioVideo, GetParam(), kExpected)); } +#if defined(OS_LINUX) && !defined(NDEBUG) +// http://crbug.com/174294; not using MAYBE_ because IN_PROC_BROWSER_TEST_P does +// not expand the test name macro correctly, TODO(vabr, bauerb) +IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback_VideoOnly) { +#else IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoOnly) { +#endif const string16 kExpected = ASCIIToUTF16("ENDED"); ASSERT_NO_FATAL_FAILURE( TestSimplePlayback("bear-320x240-v-enc_v.webm", kWebMVideoOnly, GetParam(), kExpected)); } +#if defined(OS_LINUX) && !defined(NDEBUG) +// http://crbug.com/174294; not using MAYBE_ because IN_PROC_BROWSER_TEST_P does +// not expand the test name macro correctly, TODO(vabr, bauerb) +IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, + DISABLED_BasicPlayback_VideoClearAudio) { +#else IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoClearAudio) { +#endif const string16 kExpected = ASCIIToUTF16("ENDED"); ASSERT_NO_FATAL_FAILURE( TestSimplePlayback("bear-320x240-av-enc_v.webm", kWebMAudioVideo, |