From 31067ddfddf1eac73de484a8f506cc791640b218 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Wed, 27 Aug 2014 14:48:09 -0400 Subject: Update GPU baselines for the fontMgr GMs. BUG=skia:2829 Review URL: https://codereview.chromium.org/511973002 --- .../expected-results.json | 12 ++++++------ .../expected-results.json | 12 ++++++------ .../expected-results.json | 18 ++++++++++++------ .../expected-results.json | 18 ++++++++++++------ .../expected-results.json | 8 ++++++-- .../expected-results.json | 8 ++++++-- .../expected-results.json | 2 +- .../expected-results.json | 14 +++++++++++--- .../expected-results.json | 4 ++-- .../expected-results.json | 4 ++-- expectations/gm/ignored-tests.txt | 5 ----- 11 files changed, 64 insertions(+), 41 deletions(-) diff --git a/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Debug/expected-results.json index 1b263b40bb..feff243b86 100644 --- a/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Debug/expected-results.json +++ b/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Debug/expected-results.json @@ -6763,28 +6763,28 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 7072812895837463931 + 1321940012742590695 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "fontmgr_iter_msaa16.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 7072812895837463931 + 1321940012742590695 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "fontmgr_iter_nvprmsaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 6555005488032990867 + 9583722823847795919 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "fontmgr_match_565.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Release/expected-results.json index 1b263b40bb..feff243b86 100644 --- a/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Release/expected-results.json +++ b/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Release/expected-results.json @@ -6763,28 +6763,28 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 7072812895837463931 + 1321940012742590695 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "fontmgr_iter_msaa16.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 7072812895837463931 + 1321940012742590695 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "fontmgr_iter_nvprmsaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 6555005488032990867 + 9583722823847795919 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "fontmgr_match_565.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json index 055a1602b0..5bc2dc534c 100644 --- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json +++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json @@ -6095,21 +6095,27 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 7072812895837463931 + 1857288326388942863 ] ], - "ignore-failure": false, - "reviewed-by-human": false + "bugs": [ + 2887 + ], + "ignore-failure": true, + "reviewed-by-human": true }, "fontmgr_iter_msaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 7072812895837463931 + 1857288326388942863 ] ], - "ignore-failure": false, - "reviewed-by-human": false + "bugs": [ + 2887 + ], + "ignore-failure": true, + "reviewed-by-human": true }, "fontmgr_match_565.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json index 1c2780a4e4..a1af0a1c10 100644 --- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json +++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json @@ -6095,21 +6095,27 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 7072812895837463931 + 1857288326388942863 ] ], - "ignore-failure": false, - "reviewed-by-human": false + "bugs": [ + 2887 + ], + "ignore-failure": true, + "reviewed-by-human": true }, "fontmgr_iter_msaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 7072812895837463931 + 1857288326388942863 ] ], - "ignore-failure": false, - "reviewed-by-human": false + "bugs": [ + 2887 + ], + "ignore-failure": true, + "reviewed-by-human": true }, "fontmgr_match_565.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json index 398607be8c..8dad6422f0 100644 --- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json +++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json @@ -4519,10 +4519,14 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 7072812895837463931 + 1857288326388942863 ] ], - "reviewed-by-human": false + "bugs": [ + 2887 + ], + "ignore-failure": true, + "reviewed-by-human": true }, "fontmgr_match_565.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json index 398607be8c..8dad6422f0 100644 --- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json +++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json @@ -4519,10 +4519,14 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 7072812895837463931 + 1857288326388942863 ] ], - "reviewed-by-human": false + "bugs": [ + 2887 + ], + "ignore-failure": true, + "reviewed-by-human": true }, "fontmgr_match_565.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Android-Reference-Unknown-Arm64-Debug/expected-results.json b/expectations/gm/Test-Android-Reference-Unknown-Arm64-Debug/expected-results.json index 268ff7ddd1..6ebe9616c0 100644 --- a/expectations/gm/Test-Android-Reference-Unknown-Arm64-Debug/expected-results.json +++ b/expectations/gm/Test-Android-Reference-Unknown-Arm64-Debug/expected-results.json @@ -5035,7 +5035,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 11620272997581822107 + 2508069758630978869 ] ], "reviewed-by-human": true diff --git a/expectations/gm/Test-Android-Reference-Unknown-Arm64-Release/expected-results.json b/expectations/gm/Test-Android-Reference-Unknown-Arm64-Release/expected-results.json index 2da681a96d..b10596bef3 100644 --- a/expectations/gm/Test-Android-Reference-Unknown-Arm64-Release/expected-results.json +++ b/expectations/gm/Test-Android-Reference-Unknown-Arm64-Release/expected-results.json @@ -5017,25 +5017,33 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 11620272997581822107 + 16895145046125160228 ] ], + "bugs": [ + 2887 + ], + "ignore-failure": true, "reviewed-by-human": true }, "fontmgr_iter_msaa16.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 11620272997581822107 + 16895145046125160228 ] ], + "bugs": [ + 2887 + ], + "ignore-failure": true, "reviewed-by-human": true }, "fontmgr_iter_nvprmsaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 11620272997581822107 + 17324741886408040948 ] ], "reviewed-by-human": true diff --git a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json index bad95ba641..e4905b17ca 100644 --- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json +++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json @@ -4569,10 +4569,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 18038814198885194090 + 13605807214433697 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "fontmgr_match_565.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json index 3352322057..6ba02d5eb5 100644 --- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json +++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json @@ -4569,10 +4569,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 18038814198885194090 + 13605807214433697 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "fontmgr_match_565.png": { "allowed-digests": [ diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt index 3bbd3b1686..58bc8955c8 100644 --- a/expectations/gm/ignored-tests.txt +++ b/expectations/gm/ignored-tests.txt @@ -33,11 +33,6 @@ ## epoger will rebaseline by 25 Dec 2013 #gradtext -# Extending fontmgr testing -## http://skbug.com/2829 : ignoring failures on gradtext GM test -fontmgr_iter_factory -fontmgr_iter - # To be rebaselined (fmalita) textblob -- cgit v1.2.3