diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-29 16:56:53 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-29 16:56:53 +0000 |
| commit | 0b8bbf685b8fac68c0e7e052fd06c6768ba1e98d (patch) | |
| tree | 3f30418cd9206f622f3f84bda986cd081f3ffced /expectations | |
| parent | a095041f5148dd1e71f38d0546335ed94199104b (diff) | |
Rebaseline stragglers, mark shadertext2 as ignore on ubunutu for msaa configs.
BUG=skia:2619
Review URL: https://codereview.chromium.org/308723002
git-svn-id: http://skia.googlecode.com/svn/trunk@14964 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'expectations')
8 files changed, 30 insertions, 14 deletions
diff --git a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json index a1d526fee7..44c32b3c44 100644 --- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json +++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json @@ -15211,7 +15211,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 13562391436655636242 + 2614658944612492840 ] ], "reviewed-by-human": true diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json index d58b1613ff..535d945a55 100644 --- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json +++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json @@ -15675,7 +15675,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 13562391436655636242 + 2614658944612492840 ] ], "reviewed-by-human": true diff --git a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json index 8429bdec1e..d627eee7f9 100644 --- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json +++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json @@ -14906,7 +14906,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 13562391436655636242 + 2614658944612492840 ] ], "reviewed-by-human": true diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json index de81f44482..146cb18a4b 100644 --- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json +++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json @@ -16280,10 +16280,14 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 2415805639447437786 + 12366755253801250205 ] ], - "reviewed-by-human": true + "bugs": [ + 2619 + ], + "ignore-failure": true, + "reviewed-by-human": false }, "shadertext2_nvprmsaa4.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json index 7e8f590459..5cd9484a4d 100644 --- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json +++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json @@ -9274,7 +9274,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 13704381245629684333 + 12617614780925646679 ] ], "reviewed-by-human": true @@ -9301,7 +9301,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 13206855341598955499 + 9743406049766573166 ] ], "reviewed-by-human": true @@ -16433,10 +16433,14 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 13374125976246952627 + 17518799550679467287 ] ], - "reviewed-by-human": true + "bugs": [ + 2619 + ], + "ignore-failure": true, + "reviewed-by-human": false }, "shadertext2_pdf-poppler.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json index f76d907394..24b1225063 100644 --- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json +++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json @@ -16517,10 +16517,14 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 9062092996596322126 + 4702027525692342270 ] ], - "reviewed-by-human": true + "bugs": [ + 2619 + ], + "ignore-failure": true, + "reviewed-by-human": false }, "shadertext2_pdf-poppler.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json index 18d79bc27a..7436c4357d 100644 --- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json +++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json @@ -16602,10 +16602,14 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 15120900084396668830 + 9290689085471276179 ] ], - "reviewed-by-human": true + "bugs": [ + 2619 + ], + "ignore-failure": true, + "reviewed-by-human": false }, "shadertext2_nvprmsaa4.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json index f46813dc7a..7757e389ef 100644 --- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json +++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json @@ -13332,4 +13332,4 @@ "reviewed-by-human": false } } -} +}
\ No newline at end of file |