aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar scroggo <scroggo@google.com>2015-12-03 09:49:02 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-12-03 09:49:02 -0800
commit4f11b1be550a02261a1ebbbeeb9ecc2690cf5696 (patch)
tree52f4494018a332e6e88e725cda9b29ebf6e06635
parent54ed1edda53581bfbaf3470f360ff312b5374bca (diff)
Stop disabling fixed test
skbug.com/1282 has been fixed, so there is no need to skip these images BUG=skia:1282 Review URL: https://codereview.chromium.org/1391143007
-rw-r--r--tools/dm_flags.json18
-rwxr-xr-xtools/dm_flags.py5
2 files changed, 3 insertions, 20 deletions
diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index b41b8439d3..6cfc31327d 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -356,9 +356,7 @@
"decode",
"inc14.png",
"--match",
- "~WritePixels",
- "~tabl_mozilla_0",
- "~desk_yahoonews_0"
+ "~WritePixels"
],
"Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Release": [
"--config",
@@ -523,8 +521,6 @@
"decode",
"inc14.png",
"--match",
- "~tabl_mozilla_0",
- "~desk_yahoonews_0",
"~imagefiltersclipped",
"~imagefilterscropexpand",
"~scaled_tilemodes_npot",
@@ -690,10 +686,7 @@
"_",
"image",
"decode",
- "inc14.png",
- "--match",
- "~tabl_mozilla_0",
- "~desk_yahoonews_0"
+ "inc14.png"
],
"Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Debug": [
"--config",
@@ -856,10 +849,7 @@
"_",
"image",
"decode",
- "inc14.png",
- "--match",
- "~tabl_mozilla_0",
- "~desk_yahoonews_0"
+ "inc14.png"
],
"Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release": [
"--config",
@@ -1032,8 +1022,6 @@
"_",
"interlaced3.png",
"--match",
- "~tabl_mozilla_0",
- "~desk_yahoonews_0",
"~ResourceCache"
],
"Test-Mac10.8-Clang-MacMini4.1-CPU-SSE4-x86_64-Release": [
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index 052be598c3..2adf42625b 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -176,11 +176,6 @@ def get_args(bot):
if 'GalaxyS3' in bot: # skia:1699
match.append('~WritePixels')
- # skia:3249: these images flakily don't decode on Android.
- if 'Android' in bot:
- match.append('~tabl_mozilla_0')
- match.append('~desk_yahoonews_0')
-
if 'NexusPlayer' in bot:
match.append('~ResourceCache')