Commit 245b84a9 authored by Chris Sharp's avatar Chris Sharp Committed by Commit Bot

Disable EncryptedMediaTest test on linux-trusty-rel

TBR=xhwang

Bug: 1029355
Change-Id: I42665ef9025a00ced5c33c88fc74781b0cec1c56
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1943031Reviewed-by: default avatarChris Sharp <csharp@chromium.org>
Commit-Queue: Chris Sharp <csharp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720196}
parent 06b38abd
...@@ -763,6 +763,7 @@ if (!is_android) { ...@@ -763,6 +763,7 @@ if (!is_android) {
"//ppapi:ppapi_tests", "//ppapi:ppapi_tests",
"//ppapi:power_saver_test_plugin", "//ppapi:power_saver_test_plugin",
"//testing/buildbot/filters:browser_tests_filters", "//testing/buildbot/filters:browser_tests_filters",
"//testing/buildbot/filters:linux_trusty_rel_browser_tests_filters",
"//third_party/mesa_headers", "//third_party/mesa_headers",
"//third_party/widevine/cdm:widevine_test_license_server", "//third_party/widevine/cdm:widevine_test_license_server",
"//tools/media_engagement_preload:generator", "//tools/media_engagement_preload:generator",
......
...@@ -5991,6 +5991,9 @@ ...@@ -5991,6 +5991,9 @@
"test": "boringssl_ssl_tests" "test": "boringssl_ssl_tests"
}, },
{ {
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/linux_trusty_rel.browser_tests.filter"
],
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py" "script": "//testing/merge_scripts/standard_gtest_merge.py"
......
...@@ -125,6 +125,12 @@ source_set("fuchsia_filters") { ...@@ -125,6 +125,12 @@ source_set("fuchsia_filters") {
] ]
} }
source_set("linux_trusty_rel_browser_tests_filters") {
data = [
"//testing/buildbot/filters/linux_trusty_rel.browser_tests.filter",
]
}
source_set("ozone_unittests_filters") { source_set("ozone_unittests_filters") {
data = [ data = [
"//testing/buildbot/filters/chromeos.ozone_unittests.filter", "//testing/buildbot/filters/chromeos.ozone_unittests.filter",
......
# http://crbug.com/1029355
CDM_10/ECKEncryptedMediaTest.DecryptOnly_VideoOnly_MP4_CBCS/0
CDM_10/ECKEncryptedMediaTest.MultipeCdmTypes/0
CDM_11/ECKEncryptedMediaTest.DecryptOnly_VideoOnly_MP4_CBCS/0
MSE_ClearKey/EncryptedMediaTest.FrameSizeChangeVideo/0
MSE_ClearKey/EncryptedMediaTest.Playback_AudioOnly_MP4_OPUS/0
MSE_ClearKey/EncryptedMediaTest.Playback_Encryption_CBCS/0
MSE_ClearKey/EncryptedMediaTest.Playback_VideoOnly_MP4_AV1/0
MSE_ClearKey/EncryptedMediaTest.PolicyCheck/0
MSE_ExternalClearKey/EncryptedMediaTest.Playback_VideoOnly_WebM_AV1/0
SRC_ExternalClearKey/EncryptedMediaTest.ConfigChangeVideo_ClearToClear/0
SRC_ExternalClearKey/EncryptedMediaTest.EncryptedMediaDisabled/0
SRC_ExternalClearKey/EncryptedMediaTest.InvalidResponseKeyError/0
SRC_ExternalClearKey/EncryptedMediaTest.Playback_EncryptedVideo_CBCS_EncryptedAudio_CENC/0
SRC_ExternalClearKey/EncryptedMediaTest.Playback_VideoAudio_WebM_Opus/0
\ No newline at end of file
...@@ -236,6 +236,11 @@ ...@@ -236,6 +236,11 @@
'shards': 31, 'shards': 31,
}, },
}, },
'linux-trusty-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/linux_trusty_rel.browser_tests.filter',
]
},
# chromium.win # chromium.win
'Win7 Tests (1)': { 'Win7 Tests (1)': {
# This is for slow test execution that often becomes a critical path of # This is for slow test execution that often becomes a critical path of
......
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