Revert of Blacklist GLVertexAttributesBench and GLVec4ScalarBench for GalaxyS4 due...

Reason for revert:
should hopefully be fixed, please reland if not.

Original issue's description:
> Blacklist GLVertexAttributesBench and GLVec4ScalarBench for GalaxyS4 due to skia:4373
>
> BUG=skia:4373
>
> Committed: https://skia.googlesource.com/skia/+/3420d2796bad5ce553efb9909790ea72e578dc47

TBR=borenet@google.com,benjaminwagner@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4373

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

diff --git a/tools/nanobench_flags.json b/tools/nanobench_flags.json
index 049bf54..6084ad1 100644 (file)
--- a/tools/nanobench_flags.json
+++ b/tools/nanobench_flags.json
@@ -49,9 +49,7 @@
     "~blurroundrect", 
     "~patch_grid", 
     "~desk_carsvg", 
-    "~GLInstancedArraysBench", 
-    "~GLVertexAttributesBench", 
-    "~GLVec4ScalarBench"
+    "~GLInstancedArraysBench"
   ], 
   "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": [
     "--scales", 

diff --git a/tools/nanobench_flags.py b/tools/nanobench_flags.py
index 86d7203..f11ea1f 100755 (executable)
--- a/tools/nanobench_flags.py
+++ b/tools/nanobench_flags.py
@@ -69,8 +69,6 @@ def get_args(bot):
     match.append('~desk_unicodetable')
   if 'GalaxyS4' in bot:
     match.append('~GLInstancedArraysBench')  # skia:4371
-    # skia:4373
-    match.extend(['~GLVertexAttributesBench', '~GLVec4ScalarBench'])
 
   if 'iOS' in bot:
     match.append('~blurroundrect')