Commit 79ec9015 authored by John Budorick's avatar John Budorick Committed by Commit Bot

android: add test filter file for gl_tests on emulators.

Bug: 1039873
Change-Id: I114ea6f03b57911b510e449a356907207d21ac32
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1992163
Commit-Queue: John Budorick <jbudorick@chromium.org>
Auto-Submit: John Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#729507}
parent 34a865b8
...@@ -2906,7 +2906,8 @@ ...@@ -2906,7 +2906,8 @@
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
"--recover-devices", "--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android23.textpb" "--avd-config=../../tools/android/avd/proto/generic_android23.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.gl_tests.filter"
], ],
"merge": { "merge": {
"args": [ "args": [
...@@ -7086,7 +7087,8 @@ ...@@ -7086,7 +7087,8 @@
"args": [ "args": [
"--gs-results-bucket=chromium-result-details", "--gs-results-bucket=chromium-result-details",
"--recover-devices", "--recover-devices",
"--avd-config=../../tools/android/avd/proto/generic_android28.textpb" "--avd-config=../../tools/android/avd/proto/generic_android28.textpb",
"--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.gl_tests.filter"
], ],
"merge": { "merge": {
"args": [ "args": [
......
...@@ -151,6 +151,7 @@ source_set("gl_tests_filters") { ...@@ -151,6 +151,7 @@ source_set("gl_tests_filters") {
testonly = true testonly = true
data = [ data = [
"//testing/buildbot/filters/android.emulator.gl_tests.filter",
"//testing/buildbot/filters/android.pie_arm64_rel.gl_tests.filter", "//testing/buildbot/filters/android.pie_arm64_rel.gl_tests.filter",
] ]
} }
......
# https://crbug.com/1039873
-WithWorkarounds/GLVirtualContextsTest.*
-SetAggressivelyFreeResourcesTest.*
-GLBGRAMipMapTest.*
-GpuFenceTest.*
...@@ -244,8 +244,8 @@ ...@@ -244,8 +244,8 @@
}, },
'linux-trusty-rel': { 'linux-trusty-rel': {
'args': [ 'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/linux_trusty_rel.browser_tests.filter', '--test-launcher-filter-file=../../testing/buildbot/filters/linux_trusty_rel.browser_tests.filter',
] ],
}, },
'mac-code-coverage': { 'mac-code-coverage': {
# A subset of tests seem to cause WindowServer deaths on VMs. # A subset of tests seem to cause WindowServer deaths on VMs.
...@@ -698,11 +698,21 @@ ...@@ -698,11 +698,21 @@
}, },
'use_xvfb': False, 'use_xvfb': False,
}, },
'android-marshmallow-x86-fyi-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.gl_tests.filter',
],
},
'android-pie-arm64-rel': { 'android-pie-arm64-rel': {
'args': [ 'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.pie_arm64_rel.gl_tests.filter', # https://crbug.com/1034007 '--test-launcher-filter-file=../../testing/buildbot/filters/android.pie_arm64_rel.gl_tests.filter', # https://crbug.com/1034007
], ],
}, },
'android-pie-x86-fyi-rel': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.gl_tests.filter',
],
},
}, },
}, },
'gl_unittests': { 'gl_unittests': {
......
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