From 446aefe2aff58ff7e1b052ab6288a227a97776a4 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 23 May 2014 19:08:17 +0000 Subject: [PATCH] instead of ignoring testimagefilters EVERYWHERE, just ignore particular failures BUG=skia:2603 NOTREECHECKS=True NOTRY=True R=fmalita@google.com TBR=fmalita Author: epoger@google.com Review URL: https://codereview.chromium.org/296213009 git-svn-id: http://skia.googlecode.com/svn/trunk@14876 2bbb7eff-a529-9590-31e7-b0007b416f81 --- .../expected-results.json | 8 ++++++-- .../expected-results.json | 8 ++++++-- .../expected-results.json | 8 ++++++-- .../expected-results.json | 8 ++++++-- expectations/gm/ignored-tests.txt | 4 ---- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json index 15f47db515..3bcecb228e 100644 --- a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json +++ b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json @@ -6669,10 +6669,14 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 4806854696235085637 + 14688683472045987229 ] ], - "ignore-failure": false + "bugs": [ + 2603 + ], + "ignore-failure": false, + "reviewed-by-human": false }, "texdata_565.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json index 4746220026..5bab958235 100644 --- a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json +++ b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json @@ -6661,10 +6661,14 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 4806854696235085637 + 14688683472045987229 ] ], - "ignore-failure": false + "bugs": [ + 2603 + ], + "ignore-failure": false, + "reviewed-by-human": false }, "texdata_565.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json index 0cf00fcea1..37f6a9cb8a 100644 --- a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json +++ b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json @@ -6669,10 +6669,14 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 4806854696235085637 + 14688683472045987229 ] ], - "ignore-failure": false + "bugs": [ + 2603 + ], + "ignore-failure": false, + "reviewed-by-human": false }, "texdata_565.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json index 0cf00fcea1..37f6a9cb8a 100644 --- a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json +++ b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json @@ -6669,10 +6669,14 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 4806854696235085637 + 14688683472045987229 ] ], - "ignore-failure": false + "bugs": [ + 2603 + ], + "ignore-failure": false, + "reviewed-by-human": false }, "texdata_565.png": { "allowed-digests": [ diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt index 4be4dc3bc4..7da2be33ff 100644 --- a/expectations/gm/ignored-tests.txt +++ b/expectations/gm/ignored-tests.txt @@ -106,7 +106,3 @@ downsamplebitmap_checkerboard_medium_512_256 downsamplebitmap_text_medium_72.00pt drawbitmapmatrix verylargebitmap - -# https://code.google.com/p/skia/issues/detail?id=2603 -# started failing on Android, but actual results missing. -testimagefilters