Stop running image tests on msaa.

Blacklist all image tests on msaa. We do not run them anyway (since
they will not do anything interestingly different from drawing to the
raster backend) - we early exit from Src::draw(), but we still need to
create a render target that matches the size of the image (when not
blacklisted).

Remove the more specific blacklist of a particular image, which is
covered by this one.

BUG=skia:4045

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

diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index aed4022..ce3c5b1 100644 (file)
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -20,11 +20,11 @@
     "gm", 
     "image", 
     "--blacklist", 
-    "gpu", 
+    "msaa", 
+    "image", 
     "_", 
     "_", 
-    "PANO_20121023_214540.jpg", 
-    "msaa", 
+    "gpu", 
     "_", 
     "_", 
     "PANO_20121023_214540.jpg", 
@@ -178,11 +178,11 @@
     "--threads", 
     "0", 
     "--blacklist", 
-    "gpu", 
+    "msaa", 
+    "image", 
     "_", 
     "_", 
-    "PANO_20121023_214540.jpg", 
-    "msaa", 
+    "gpu", 
     "_", 
     "_", 
     "PANO_20121023_214540.jpg", 
@@ -309,11 +309,11 @@
     "--threads", 
     "0", 
     "--blacklist", 
-    "gpu", 
+    "msaa", 
+    "image", 
     "_", 
     "_", 
-    "PANO_20121023_214540.jpg", 
-    "msaa", 
+    "gpu", 
     "_", 
     "_", 
     "PANO_20121023_214540.jpg", 
@@ -437,11 +437,11 @@
     "tests", 
     "gm", 
     "--blacklist", 
-    "gpu", 
+    "msaa", 
+    "image", 
     "_", 
     "_", 
-    "PANO_20121023_214540.jpg", 
-    "msaa", 
+    "gpu", 
     "_", 
     "_", 
     "PANO_20121023_214540.jpg", 
@@ -567,11 +567,11 @@
     "tests", 
     "gm", 
     "--blacklist", 
-    "gpu", 
+    "msaa", 
+    "image", 
     "_", 
     "_", 
-    "PANO_20121023_214540.jpg", 
-    "msaa", 
+    "gpu", 
     "_", 
     "_", 
     "PANO_20121023_214540.jpg", 
@@ -693,11 +693,11 @@
     "gm", 
     "image", 
     "--blacklist", 
-    "gpu", 
+    "msaa", 
+    "image", 
     "_", 
     "_", 
-    "PANO_20121023_214540.jpg", 
-    "msaa", 
+    "gpu", 
     "_", 
     "_", 
     "PANO_20121023_214540.jpg", 
@@ -833,11 +833,11 @@
     "gm", 
     "image", 
     "--blacklist", 
-    "gpu", 
+    "msaa", 
+    "image", 
     "_", 
     "_", 
-    "PANO_20121023_214540.jpg", 
-    "msaa", 
+    "gpu", 
     "_", 
     "_", 
     "PANO_20121023_214540.jpg", 
@@ -971,11 +971,11 @@
     "gm", 
     "image", 
     "--blacklist", 
-    "gpu", 
+    "msaa", 
+    "image", 
     "_", 
     "_", 
-    "PANO_20121023_214540.jpg", 
-    "msaa", 
+    "gpu", 
     "_", 
     "_", 
     "PANO_20121023_214540.jpg", 
@@ -1132,11 +1132,11 @@
     "tests", 
     "gm", 
     "--blacklist", 
-    "gpu", 
+    "msaa", 
+    "image", 
     "_", 
     "_", 
-    "PANO_20121023_214540.jpg", 
-    "msaa", 
+    "gpu", 
     "_", 
     "_", 
     "PANO_20121023_214540.jpg", 
@@ -1293,11 +1293,11 @@
     "tests", 
     "gm", 
     "--blacklist", 
-    "gpu", 
+    "msaa", 
+    "image", 
     "_", 
     "_", 
-    "PANO_20121023_214540.jpg", 
-    "msaa", 
+    "gpu", 
     "_", 
     "_", 
     "PANO_20121023_214540.jpg", 

diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index 524e1b6..8107970 100755 (executable)
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -80,9 +80,13 @@ def get_args(bot):
     args.extend(('--threads', '0'))
 
   blacklist = []
+
+  # We do not draw image sources on msaa anyway, so avoid the creation of
+  # large canvases. skbug.com/4045
+  blacklist.extend('msaa image _ _'.split(' '))
+
   # This image is too large to be a texture for many GPUs.
   blacklist.extend('gpu _ _ PANO_20121023_214540.jpg'.split(' '))
-  blacklist.extend('msaa _ _ PANO_20121023_214540.jpg'.split(' '))
 
   # Several of the newest version bmps fail on SkImageDecoder
   blacklist.extend('_ image decode pal8os2v2.bmp'.split(' '))