Fix android_run_skia script to allow for larger blacklist

BUG=skia:

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

diff --git a/platform_tools/android/bin/android_run_skia b/platform_tools/android/bin/android_run_skia
index 7c69309..016bd79 100755 (executable)
--- a/platform_tools/android/bin/android_run_skia
+++ b/platform_tools/android/bin/android_run_skia
@@ -25,9 +25,15 @@ fi
 
 if [ $LOGCAT ]; then $ADB $DEVICE_SERIAL logcat -c; fi
 STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)"
-$ADB ${DEVICE_SERIAL} shell \
-    "LD_LIBRARY_PATH=/data/local/tmp:$LD_LIBRARY_PATH \
-     /data/local/tmp/skia_launcher ${APP_ARGS[*]}; echo \$? > ${STATUS_FILENAME}"
+CMD_FILENAME=".skia_cmd_tmp_$(date +%s%N)"
+echo "LD_LIBRARY_PATH=/data/local/tmp:$LD_LIBRARY_PATH \
+     /data/local/tmp/skia_launcher ${APP_ARGS[*]}; \
+     echo \$? > ${STATUS_FILENAME}" > ${CMD_FILENAME}
+chmod +x ${CMD_FILENAME}
+$ADB ${DEVICE_SERIAL} push ${CMD_FILENAME} /data/local/tmp
+rm ${CMD_FILENAME}
+$ADB ${DEVICE_SERIAL} shell sh /data/local/tmp/${CMD_FILENAME}
+    
 if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exists; fi')" ]; then
   if [ $LOGCAT ]; then $ADB $DEVICE_SERIAL logcat -d; fi
   echo "***********************************************************************"
@@ -37,7 +43,7 @@ if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exis
 fi
 
 EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}`
-$ADB ${DEVICE_SERIAL} shell rm -f ${STATUS_FILENAME}
+$ADB ${DEVICE_SERIAL} shell rm -f ${STATUS_FILENAME} ${CMD_FILENAME}
 
 # check to see if the 'cat' command failed and print errors accordingly
 if [[ ${EXIT_CODE} == *${STATUS_FILENAME}* ]]; then

diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index a571b74..0cdcd16 100644 (file)
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -17,6 +17,54 @@
     "msaa", 
     "_", 
     "PANO_20121023_214540.jpg", 
+    "_", 
+    "image", 
+    "pal8os2v2.bmp", 
+    "_", 
+    "image", 
+    "pal8v4.bmp", 
+    "_", 
+    "image", 
+    "pal8v5.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565pal.bmp", 
+    "_", 
+    "image", 
+    "rgb32-111110.bmp", 
+    "_", 
+    "image", 
+    "rgb32bf.bmp", 
+    "_", 
+    "image", 
+    "rgba32.bmp", 
+    "_", 
+    "image", 
+    "rgba32abf.bmp", 
+    "_", 
+    "image", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "image", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "image", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "subset", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "subset", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "subset", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "image", 
+    "Hopstarter-Mac-Folders-Apple.ico", 
     "gpu", 
     "skp", 
     "_", 
@@ -59,6 +107,54 @@
     "msaa", 
     "_", 
     "PANO_20121023_214540.jpg", 
+    "_", 
+    "image", 
+    "pal8os2v2.bmp", 
+    "_", 
+    "image", 
+    "pal8v4.bmp", 
+    "_", 
+    "image", 
+    "pal8v5.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565pal.bmp", 
+    "_", 
+    "image", 
+    "rgb32-111110.bmp", 
+    "_", 
+    "image", 
+    "rgb32bf.bmp", 
+    "_", 
+    "image", 
+    "rgba32.bmp", 
+    "_", 
+    "image", 
+    "rgba32abf.bmp", 
+    "_", 
+    "image", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "image", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "image", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "subset", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "subset", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "subset", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "image", 
+    "Hopstarter-Mac-Folders-Apple.ico", 
     "gpu", 
     "skp", 
     "_", 
@@ -94,6 +190,54 @@
     "msaa", 
     "_", 
     "PANO_20121023_214540.jpg", 
+    "_", 
+    "image", 
+    "pal8os2v2.bmp", 
+    "_", 
+    "image", 
+    "pal8v4.bmp", 
+    "_", 
+    "image", 
+    "pal8v5.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565pal.bmp", 
+    "_", 
+    "image", 
+    "rgb32-111110.bmp", 
+    "_", 
+    "image", 
+    "rgb32bf.bmp", 
+    "_", 
+    "image", 
+    "rgba32.bmp", 
+    "_", 
+    "image", 
+    "rgba32abf.bmp", 
+    "_", 
+    "image", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "image", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "image", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "subset", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "subset", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "subset", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "image", 
+    "Hopstarter-Mac-Folders-Apple.ico", 
     "gpu", 
     "skp", 
     "_", 
@@ -131,6 +275,54 @@
     "msaa", 
     "_", 
     "PANO_20121023_214540.jpg", 
+    "_", 
+    "image", 
+    "pal8os2v2.bmp", 
+    "_", 
+    "image", 
+    "pal8v4.bmp", 
+    "_", 
+    "image", 
+    "pal8v5.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565pal.bmp", 
+    "_", 
+    "image", 
+    "rgb32-111110.bmp", 
+    "_", 
+    "image", 
+    "rgb32bf.bmp", 
+    "_", 
+    "image", 
+    "rgba32.bmp", 
+    "_", 
+    "image", 
+    "rgba32abf.bmp", 
+    "_", 
+    "image", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "image", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "image", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "subset", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "subset", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "subset", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "image", 
+    "Hopstarter-Mac-Folders-Apple.ico", 
     "gpu", 
     "skp", 
     "_", 
@@ -173,6 +365,54 @@
     "msaa", 
     "_", 
     "PANO_20121023_214540.jpg", 
+    "_", 
+    "image", 
+    "pal8os2v2.bmp", 
+    "_", 
+    "image", 
+    "pal8v4.bmp", 
+    "_", 
+    "image", 
+    "pal8v5.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565pal.bmp", 
+    "_", 
+    "image", 
+    "rgb32-111110.bmp", 
+    "_", 
+    "image", 
+    "rgb32bf.bmp", 
+    "_", 
+    "image", 
+    "rgba32.bmp", 
+    "_", 
+    "image", 
+    "rgba32abf.bmp", 
+    "_", 
+    "image", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "image", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "image", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "subset", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "subset", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "subset", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "image", 
+    "Hopstarter-Mac-Folders-Apple.ico", 
     "--threads", 
     "1"
   ], 
@@ -196,6 +436,54 @@
     "msaa", 
     "_", 
     "PANO_20121023_214540.jpg", 
+    "_", 
+    "image", 
+    "pal8os2v2.bmp", 
+    "_", 
+    "image", 
+    "pal8v4.bmp", 
+    "_", 
+    "image", 
+    "pal8v5.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565pal.bmp", 
+    "_", 
+    "image", 
+    "rgb32-111110.bmp", 
+    "_", 
+    "image", 
+    "rgb32bf.bmp", 
+    "_", 
+    "image", 
+    "rgba32.bmp", 
+    "_", 
+    "image", 
+    "rgba32abf.bmp", 
+    "_", 
+    "image", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "image", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "image", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "subset", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "subset", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "subset", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "image", 
+    "Hopstarter-Mac-Folders-Apple.ico", 
     "pdf", 
     "_", 
     ".webp", 
@@ -227,6 +515,54 @@
     "msaa", 
     "_", 
     "PANO_20121023_214540.jpg", 
+    "_", 
+    "image", 
+    "pal8os2v2.bmp", 
+    "_", 
+    "image", 
+    "pal8v4.bmp", 
+    "_", 
+    "image", 
+    "pal8v5.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565pal.bmp", 
+    "_", 
+    "image", 
+    "rgb32-111110.bmp", 
+    "_", 
+    "image", 
+    "rgb32bf.bmp", 
+    "_", 
+    "image", 
+    "rgba32.bmp", 
+    "_", 
+    "image", 
+    "rgba32abf.bmp", 
+    "_", 
+    "image", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "image", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "image", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "subset", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "subset", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "subset", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "image", 
+    "Hopstarter-Mac-Folders-Apple.ico", 
     "--match", 
     "~Math"
   ], 
@@ -250,6 +586,54 @@
     "msaa", 
     "_", 
     "PANO_20121023_214540.jpg", 
+    "_", 
+    "image", 
+    "pal8os2v2.bmp", 
+    "_", 
+    "image", 
+    "pal8v4.bmp", 
+    "_", 
+    "image", 
+    "pal8v5.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565pal.bmp", 
+    "_", 
+    "image", 
+    "rgb32-111110.bmp", 
+    "_", 
+    "image", 
+    "rgb32bf.bmp", 
+    "_", 
+    "image", 
+    "rgba32.bmp", 
+    "_", 
+    "image", 
+    "rgba32abf.bmp", 
+    "_", 
+    "image", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "image", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "image", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "subset", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "subset", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "subset", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "image", 
+    "Hopstarter-Mac-Folders-Apple.ico", 
     "pdf", 
     "_", 
     ".webp", 
@@ -284,6 +668,54 @@
     "PANO_20121023_214540.jpg", 
     "_", 
     "image", 
+    "pal8os2v2.bmp", 
+    "_", 
+    "image", 
+    "pal8v4.bmp", 
+    "_", 
+    "image", 
+    "pal8v5.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565.bmp", 
+    "_", 
+    "image", 
+    "rgb16-565pal.bmp", 
+    "_", 
+    "image", 
+    "rgb32-111110.bmp", 
+    "_", 
+    "image", 
+    "rgb32bf.bmp", 
+    "_", 
+    "image", 
+    "rgba32.bmp", 
+    "_", 
+    "image", 
+    "rgba32abf.bmp", 
+    "_", 
+    "image", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "image", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "image", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "subset", 
+    "rgb24largepal.bmp", 
+    "_", 
+    "subset", 
+    "pal8os2v2-16.bmp", 
+    "_", 
+    "subset", 
+    "pal8oversizepal.bmp", 
+    "_", 
+    "image", 
+    "Hopstarter-Mac-Folders-Apple.ico", 
+    "_", 
+    "image", 
     "_", 
     "_", 
     "subset", 

diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index f05bb22..268e61c 100755 (executable)
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -1,3 +1,10 @@
+#
+# Copyright 2015 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+
 #!/usr/bin/env python
 
 usage = '''
@@ -51,6 +58,26 @@ def get_args(bot):
   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 pal8os2v2.bmp'.split(' '))
+  blacklist.extend('_ image pal8v4.bmp'.split(' '))
+  blacklist.extend('_ image pal8v5.bmp'.split(' '))
+  blacklist.extend('_ image rgb16-565.bmp'.split(' '))
+  blacklist.extend('_ image rgb16-565pal.bmp'.split(' '))
+  blacklist.extend('_ image rgb32-111110.bmp'.split(' '))
+  blacklist.extend('_ image rgb32bf.bmp'.split(' '))
+  blacklist.extend('_ image rgba32.bmp'.split(' '))
+  blacklist.extend('_ image rgba32abf.bmp'.split(' '))
+  blacklist.extend('_ image rgb24largepal.bmp'.split(' '))
+  blacklist.extend('_ image pal8os2v2-16.bmp'.split(' '))
+  blacklist.extend('_ image pal8oversizepal.bmp'.split(' '))
+  blacklist.extend('_ subset rgb24largepal.bmp'.split(' '))
+  blacklist.extend('_ subset pal8os2v2-16.bmp'.split(' '))
+  blacklist.extend('_ subset pal8oversizepal.bmp'.split(' '))
+
+  # New ico files that fail on SkImageDecoder
+  blacklist.extend('_ image Hopstarter-Mac-Folders-Apple.ico'.split(' '))
+
   # Leon doesn't care about this, so why run it?
   if 'Win' in bot:
     blacklist.extend('_ image _'.split(' '))