Disable failed GLES related tests on android-11-x86-fyi-rel
These tests are failing as android emulator may not have sufficient
support to GLES.
Bug: 1189284
Change-Id: Iec21bcfcb0d2076f2e777a6238885f034cc60d43
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2768559
Auto-Submit: Haiyang Pan <[email protected]>
Reviewed-by: Ben Pastene <[email protected]>
Commit-Queue: Ben Pastene <[email protected]>
Cr-Commit-Position: refs/heads/master@{#864410}
diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json
index c73fa14..eb1241b0 100644
--- a/testing/buildbot/chromium.android.fyi.json
+++ b/testing/buildbot/chromium.android.fyi.json
@@ -952,7 +952,8 @@
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
- "--avd-config=../../tools/android/avd/proto/generic_android30.textpb"
+ "--avd-config=../../tools/android/avd/proto/generic_android30.textpb",
+ "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11.cc_unittests.filter"
],
"merge": {
"args": [
@@ -1915,7 +1916,8 @@
"--use-cmd-decoder=validating",
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
- "--avd-config=../../tools/android/avd/proto/generic_android30.textpb"
+ "--avd-config=../../tools/android/avd/proto/generic_android30.textpb",
+ "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11.gl_tests.filter"
],
"merge": {
"args": [
@@ -2565,7 +2567,8 @@
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
- "--avd-config=../../tools/android/avd/proto/generic_android30.textpb"
+ "--avd-config=../../tools/android/avd/proto/generic_android30.textpb",
+ "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11.media_unittests.filter"
],
"merge": {
"args": [
@@ -3688,7 +3691,8 @@
"args": [
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
- "--avd-config=../../tools/android/avd/proto/generic_android30.textpb"
+ "--avd-config=../../tools/android/avd/proto/generic_android30.textpb",
+ "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11.viz_unittests.filter"
],
"merge": {
"args": [
diff --git a/testing/buildbot/filters/BUILD.gn b/testing/buildbot/filters/BUILD.gn
index 953855b9..063eb43f 100644
--- a/testing/buildbot/filters/BUILD.gn
+++ b/testing/buildbot/filters/BUILD.gn
@@ -21,6 +21,7 @@
data = [
"//testing/buildbot/filters/android.emulator.cc_unittests.filter",
+ "//testing/buildbot/filters/android.emulator_11.cc_unittests.filter",
"//testing/buildbot/filters/gpu.linux.skiarenderer_dawn_cc_unittests.filter",
"//testing/buildbot/filters/gpu.skiarenderer_dawn_cc_unittests.filter",
]
@@ -174,6 +175,7 @@
data = [
"//testing/buildbot/filters/android.emulator.gl_tests.filter",
+ "//testing/buildbot/filters/android.emulator_11.gl_tests.filter",
"//testing/buildbot/filters/android.pie_arm64_rel.gl_tests.filter",
]
}
@@ -199,6 +201,7 @@
source_set("media_unittests_filters") {
data = [
+ "//testing/buildbot/filters/android.emulator_11.media_unittests.filter",
"//testing/buildbot/filters/android.emulator_m.media_unittests.filter",
"//testing/buildbot/filters/android.emulator_p.media_unittests.filter",
]
@@ -240,6 +243,7 @@
data = [
"//testing/buildbot/filters/android.emulator.viz_unittests.filter",
+ "//testing/buildbot/filters/android.emulator_11.viz_unittests.filter",
"//testing/buildbot/filters/gpu.linux.skiarenderer_dawn_viz_unittests.filter",
]
}
diff --git a/testing/buildbot/filters/android.emulator.viz_unittests.filter b/testing/buildbot/filters/android.emulator.viz_unittests.filter
index 4ed15e3..a13d27d0 100644
--- a/testing/buildbot/filters/android.emulator.viz_unittests.filter
+++ b/testing/buildbot/filters/android.emulator.viz_unittests.filter
@@ -1,39 +1,13 @@
-# https://crbug.com/1039860
--All/GLScalerShaderPixelTest.BicubicDownscaleByHalf/0
--All/GLScalerShaderPixelTest.BicubicDownscaleByHalf/1
--All/GLScalerShaderPixelTest.BicubicDownscaleByHalf/2
--All/GLScalerShaderPixelTest.BicubicDownscaleByHalf/3
--All/GLScalerShaderPixelTest.BicubicUpscale/0
--All/GLScalerShaderPixelTest.BicubicUpscale/1
--All/GLScalerShaderPixelTest.BicubicUpscale/2
--All/GLScalerShaderPixelTest.BicubicUpscale/3
--All/GLScalerShaderPixelTest.Bilinear/0
--All/GLScalerShaderPixelTest.Bilinear/1
--All/GLScalerShaderPixelTest.Bilinear/2
--All/GLScalerShaderPixelTest.Bilinear/3
--All/GLScalerShaderPixelTest.Export_Planar/0
--All/GLScalerShaderPixelTest.Export_Planar/1
--All/GLScalerShaderPixelTest.Export_Planar/2
--All/GLScalerShaderPixelTest.Export_Planar/3
--All/GLScalerShaderPixelTest.FourTapBilinear/0
--All/GLScalerShaderPixelTest.FourTapBilinear/1
--All/GLScalerShaderPixelTest.FourTapBilinear/2
--All/GLScalerShaderPixelTest.FourTapBilinear/3
--All/GLScalerShaderPixelTest.ThreeTapBilinear/0
--All/GLScalerShaderPixelTest.ThreeTapBilinear/1
--All/GLScalerShaderPixelTest.ThreeTapBilinear/2
--All/GLScalerShaderPixelTest.ThreeTapBilinear/3
--All/GLScalerShaderPixelTest.TwoByTwoTapBilinear/0
--All/GLScalerShaderPixelTest.TwoByTwoTapBilinear/1
--All/GLScalerShaderPixelTest.TwoByTwoTapBilinear/2
--All/GLScalerShaderPixelTest.TwoByTwoTapBilinear/3
--All/GLScalerShaderPixelTest.TwoTapBilinear/0
--All/GLScalerShaderPixelTest.TwoTapBilinear/1
--All/GLScalerShaderPixelTest.TwoTapBilinear/2
--All/GLScalerShaderPixelTest.TwoTapBilinear/3
--All/GLScalerShaderPixelTest.ValidateTestHelpers/1
--All/GLScalerShaderPixelTest.ValidateTestHelpers/2
--All/GLScalerShaderPixelTest.ValidateTestHelpers/3
+# https://crbug.com/1039873
+-All/GLScalerShaderPixelTest.BicubicDownscaleByHalf/*
+-All/GLScalerShaderPixelTest.BicubicUpscale/*
+-All/GLScalerShaderPixelTest.Bilinear/*
+-All/GLScalerShaderPixelTest.Export_Planar/*
+-All/GLScalerShaderPixelTest.FourTapBilinear/*
+-All/GLScalerShaderPixelTest.ThreeTapBilinear/*
+-All/GLScalerShaderPixelTest.TwoByTwoTapBilinear/*
+-All/GLScalerShaderPixelTest.TwoTapBilinear/*
+-All/GLScalerShaderPixelTest.ValidateTestHelpers/*
-GLScalerPixelTest.CopiesByDefault
-GLScalerPixelTest.ExportsTheRedColorChannel
-GLScalerPixelTest.TranslatesVerticallyFlippedSourceWithSourceOffset
diff --git a/testing/buildbot/filters/android.emulator_11.cc_unittests.filter b/testing/buildbot/filters/android.emulator_11.cc_unittests.filter
new file mode 100644
index 0000000..15b259f
--- /dev/null
+++ b/testing/buildbot/filters/android.emulator_11.cc_unittests.filter
@@ -0,0 +1,8 @@
+# https://crbug.com/1189284
+-OopImagePixelTest.*
+-OopPixelTest.*
+-P/OopClearPixelTest.*
+-P/OopImagePixelTest.*
+-P/OopPathPixelTest.*
+-P/OopRecordFilterPixelTest.*
+-P/OopRecordShaderPixelTest.*
diff --git a/testing/buildbot/filters/android.emulator_11.gl_tests.filter b/testing/buildbot/filters/android.emulator_11.gl_tests.filter
new file mode 100644
index 0000000..75f97d8
--- /dev/null
+++ b/testing/buildbot/filters/android.emulator_11.gl_tests.filter
@@ -0,0 +1,9 @@
+# https://crbug.com/1189284
+-CopyType/GLCopyTextureCHROMIUMES3Test.CopyTextureCubeMap/0
+-CopyType/GLCopyTextureCHROMIUMES3Test.CopyTextureLevel/0
+-CopyType/GLCopyTextureCHROMIUMES3Test.FormatCombinations/0
+-CopyType/GLCopyTextureCHROMIUMES3Test.FormatCombinations/1
+-CopyType/GLCopyTextureCHROMIUMTest.ImmutableTexture/0
+-CopyType/GLCopyTextureCHROMIUMTest.ImmutableTexture/1
+-GLBGRAMipMapTest.GenerateMipmapsSucceeds
+-RasterInProcessCommandBufferTest.AllowedBetweenBeginEndRasterCHROMIUM
diff --git a/testing/buildbot/filters/android.emulator_11.media_unittests.filter b/testing/buildbot/filters/android.emulator_11.media_unittests.filter
new file mode 100644
index 0000000..4d9d471
--- /dev/null
+++ b/testing/buildbot/filters/android.emulator_11.media_unittests.filter
@@ -0,0 +1,9 @@
+# https://crbug.com/1189284
+-OopRasterMode/PaintCanvasVideoRendererWithGLTest.CopyVideoFrameTexturesToGLTextureI420/1
+-OopRasterMode/PaintCanvasVideoRendererWithGLTest.CopyVideoFrameTexturesToGLTextureNV12/1
+-OopRasterMode/PaintCanvasVideoRendererWithGLTest.CopyVideoFrameYUVDataToGLTexture/1
+-OopRasterMode/PaintCanvasVideoRendererWithGLTest.CopyVideoFrameYUVDataToGLTexture_FlipY/1
+-OopRasterMode/PaintCanvasVideoRendererWithGLTest.PaintI420/1
+-OopRasterMode/PaintCanvasVideoRendererWithGLTest.PaintI420NotSubset/1
+-OopRasterMode/PaintCanvasVideoRendererWithGLTest.PaintNV12/1
+-OopRasterMode/PaintCanvasVideoRendererWithGLTest.PaintRGBA/1
diff --git a/testing/buildbot/filters/android.emulator_11.viz_unittests.filter b/testing/buildbot/filters/android.emulator_11.viz_unittests.filter
new file mode 100644
index 0000000..b40863a
--- /dev/null
+++ b/testing/buildbot/filters/android.emulator_11.viz_unittests.filter
@@ -0,0 +1,7 @@
+# https://crbug.com/1189284
+-All/GLRendererCopierPixelTest.ExecutesCopyRequest/*
+-GLScalerPixelTest.CopiesByDefault
+-GLScalerPixelTest.ExportsTheRedColorChannel
+-GLScalerPixelTest.TranslatesVerticallyFlippedSourceWithSourceOffset
+-GLScalerPixelTest.TranslatesWithSourceOffset
+-GLScalerPixelTest.VerticallyFlipsOutput
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index d2169e35..6309515 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -713,6 +713,12 @@
'shards': 3,
},
},
+ 'android-11-x86-fyi-rel': {
+ # https://crbug.com/1039860
+ 'args': [
+ '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11.cc_unittests.filter',
+ ],
+ },
'android-marshmallow-x86-rel-non-cq': {
# https://crbug.com/1039860
'args': [
@@ -1504,6 +1510,11 @@
],
},
},
+ 'android-11-x86-fyi-rel': {
+ 'args': [
+ '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11.gl_tests.filter',
+ ],
+ },
'android-marshmallow-x86-rel-non-cq': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.gl_tests.filter',
@@ -1802,6 +1813,11 @@
},
'media_unittests': {
'modifications': {
+ 'android-11-x86-fyi-rel': {
+ 'args': [
+ '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11.media_unittests.filter',
+ ],
+ },
'android-marshmallow-x86-rel-non-cq': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_m.media_unittests.filter',
@@ -2835,6 +2851,11 @@
},
'viz_unittests': {
'modifications': {
+ 'android-11-x86-fyi-rel': {
+ 'args': [
+ '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_11.viz_unittests.filter',
+ ],
+ },
'android-marshmallow-x86-rel-non-cq': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.viz_unittests.filter',
