aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/rebaseline_server/testdata/outputs/expected
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-06 15:31:31 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-05-06 15:31:31 +0000
commit7418bd8cad3576294b48dd8e5015301e184c6af1 (patch)
tree2d14adbe42efb471ecf43cddc2e58bd085ee22a0 /gm/rebaseline_server/testdata/outputs/expected
parentde59d0ca4ad8db8a2f2155358321a51b77e75b67 (diff)
make compare_rendered_pictures process render_pictures's new JSON output format
BUG=skia:1942,skia:2230 NOTRY=True R=borenet@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/265793013 git-svn-id: http://skia.googlecode.com/svn/trunk@14591 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/rebaseline_server/testdata/outputs/expected')
-rw-r--r--gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json44
1 files changed, 28 insertions, 16 deletions
diff --git a/gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json b/gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json
index c60c7873f9..7a0c912c43 100644
--- a/gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json
+++ b/gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json
@@ -5,7 +5,7 @@
"isFilterable": true,
"isSortable": true,
"valuesAndCounts": {
- "builder1": 2
+ "TODO": 3
}
},
"config": {
@@ -13,7 +13,7 @@
"isFilterable": true,
"isSortable": true,
"valuesAndCounts": {
- "TODO": 2
+ "whole-image": 3
}
},
"resultType": {
@@ -22,7 +22,7 @@
"isSortable": true,
"valuesAndCounts": {
"failed": 1,
- "no-comparison": 0,
+ "no-comparison": 1,
"succeeded": 1
}
},
@@ -31,13 +31,14 @@
"isFilterable": true,
"isSortable": true,
"valuesAndCounts": {
- "changed.png": 1,
- "unchanged.png": 1
+ "changed.skp": 1,
+ "only-in-before.skp": 1,
+ "unchanged.skp": 1
}
}
},
"header": {
- "dataHash": "3972200251153667246",
+ "dataHash": "182723807383859624",
"isEditable": false,
"isExported": true,
"schemaVersion": 2,
@@ -48,24 +49,35 @@
"imagePairs": [
{
"extraColumns": {
- "builder": "builder1",
- "config": "TODO",
+ "builder": "TODO",
+ "config": "whole-image",
"resultType": "failed",
- "test": "changed.png"
+ "test": "changed.skp"
},
- "imageAUrl": "bitmap-64bitMD5/changed_png/8891695120562235492.png",
- "imageBUrl": "bitmap-64bitMD5/changed_png/2520753504544298264.png",
+ "imageAUrl": "bitmap-64bitMD5_8891695120562235492.png",
+ "imageBUrl": "bitmap-64bitMD5_2520753504544298264.png",
"isDifferent": true
},
{
"extraColumns": {
- "builder": "builder1",
- "config": "TODO",
+ "builder": "TODO",
+ "config": "whole-image",
+ "resultType": "no-comparison",
+ "test": "only-in-before.skp"
+ },
+ "imageAUrl": "bitmap-64bitMD5_8891695120562235492.png",
+ "imageBUrl": null,
+ "isDifferent": true
+ },
+ {
+ "extraColumns": {
+ "builder": "TODO",
+ "config": "whole-image",
"resultType": "succeeded",
- "test": "unchanged.png"
+ "test": "unchanged.skp"
},
- "imageAUrl": "bitmap-64bitMD5/unchanged_png/11092453015575919668.png",
- "imageBUrl": "bitmap-64bitMD5/unchanged_png/11092453015575919668.png",
+ "imageAUrl": "bitmap-64bitMD5_11092453015575919668.png",
+ "imageBUrl": "bitmap-64bitMD5_11092453015575919668.png",
"isDifferent": false
}
],