Disable failing GPU tests on Nexus 6.

BUG=skia:3942

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

diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index c864ab6..1140410 100644 (file)
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -421,6 +421,143 @@
     "~tabl_mozilla_0", 
     "~desk_yahoonews_0"
   ], 
+  "Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug": [
+    "--config", 
+    "565", 
+    "8888", 
+    "gpu", 
+    "msaa4", 
+    "serialize-8888", 
+    "tiles_rt-8888", 
+    "pipe-8888", 
+    "--src", 
+    "tests", 
+    "gm", 
+    "--blacklist", 
+    "gpu", 
+    "_", 
+    "_", 
+    "PANO_20121023_214540.jpg", 
+    "msaa", 
+    "_", 
+    "_", 
+    "PANO_20121023_214540.jpg", 
+    "_", 
+    "image", 
+    "decode", 
+    "pal8os2v2.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "pal8v4.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "pal8v5.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "rgb16-565.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "rgb16-565pal.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "rgb32-111110.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "rgb32bf.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "rgba32.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "rgba32abf.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "pal4rletrns.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "pal8rletrns.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "4bpp-pixeldata-cropped.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "8bpp-pixeldata-cropped.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "24bpp-pixeldata-cropped.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "32bpp-pixeldata-cropped.bmp", 
+    "_", 
+    "image", 
+    "subset", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "image", 
+    "subset", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "image", 
+    "subset", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "image", 
+    "subset", 
+    "4bpp-pixeldata-cropped.bmp", 
+    "_", 
+    "image", 
+    "subset", 
+    "8bpp-pixeldata-cropped.bmp", 
+    "_", 
+    "image", 
+    "subset", 
+    "24bpp-pixeldata-cropped.bmp", 
+    "_", 
+    "image", 
+    "subset", 
+    "32bpp-pixeldata-cropped.bmp", 
+    "_", 
+    "image", 
+    "decode", 
+    "Hopstarter-Mac-Folders-Apple.ico", 
+    "_", 
+    "tests", 
+    "_", 
+    "WritePixels", 
+    "_", 
+    "tests", 
+    "_", 
+    "FloatingPointTextureTest", 
+    "--match", 
+    "~tabl_mozilla_0", 
+    "~desk_yahoonews_0"
+  ], 
   "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release": [
     "--config", 
     "565", 

diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index ea657f8..9ab6fe9 100755 (executable)
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -140,6 +140,11 @@ def get_args(bot):
     blacklist.extend('gpu image subset _ msaa image subset _'.split(' '))
     blacklist.extend('msaa16 gm _ tilemodesProcess'.split(' '))
 
+  # Disabled until skbug.com/3942 is resolved.
+  if 'Nexus6' in bot:
+    blacklist.extend('_ tests _ WritePixels'.split(' '))
+    blacklist.extend('_ tests _ FloatingPointTextureTest'.split(' '))
+
   if blacklist:
     args.append('--blacklist')
     args.extend(blacklist)
@@ -180,6 +185,7 @@ def self_test():
     'Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Debug',
     'Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug',
     'Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Release',
+    'Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug',
     'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release',
     'Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release',
     'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',