5187c4313c
tools/skimage_main.cpp: Add the ability to write the results to checksum based filenames, much like GM uses. This will allow using the skpdiff server to rebaseline images. Write the keys in the JSON file as <original image>_<pref config>.png, so it matches gm_json.IMAGE_FILENAME_PATTERN. Also replace '_' with '-' in the original file name, to avoid confusing the pattern matcher. The '_' to '-' replacement also happens on the output filename. Read the keys in a similar manner. In make_outname, no longer remove a suffix. This fixes a bug where subset decoding writes multiple subsets to the same file. tools/rebaseline.py: Since the filenames written to json files now match gm_json.IMAGE_FILENAME_PATTERN, enable the option to match based on configs/tests when rebaselining skimage. test json files: Update to match the new format of output. gm/gm_expectations: Add a constructor that takes a BitmapAndDigest as input. tools/tests/skimage_self_test.py: Test that reading the expectations file just created by skimage with the same file actually compares to the original file (rather than just succeeding because expectations were missing). Change the expectations files to match the new format. Will require a buildbot change to use the new flag: https://codereview.chromium.org/27389002/ BUG=1466 R=epoger@google.com Review URL: https://codereview.chromium.org/26297004 git-svn-id: http://skia.googlecode.com/svn/trunk@11902 2bbb7eff-a529-9590-31e7-b0007b416f81
316 lines
6.6 KiB
JSON
316 lines
6.6 KiB
JSON
{
|
|
"actual-results": {
|
|
"failed": null,
|
|
"failure-ignored": null,
|
|
"no-comparison": null,
|
|
"succeeded": null
|
|
},
|
|
"expected-results": {
|
|
"01-original-jpg_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
6357612266670593419
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"02-empty-filter-JPG_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
13796732312180268210
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"03-none-filter-JPG_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
6388620656649963843
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"1-bmp_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
3196238483932704104
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"5-sm-webp_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
2589463703907036000
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"5-sm-webp-[103,149,154,207]_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
12604103674453802403
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"5-sm-webp-[110,45,267,119]_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
10993479620469649955
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"5-sm-webp-[194,120,303,142]_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
896969226539617906
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"5-sm-webp-[223,42,242,84]_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
15689397369237750677
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"5-sm-webp-[67,3,262,9]_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
13985179766273397720
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"CMYK-jpg_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
8044662098954176130
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"Lower-Left-jpg_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
3518857344143029942
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"Lower-Right-jpg_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
4640356172221432257
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"PANO-20121023-214540-jpg_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
15493791864227637231
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"Softskin-Series-Folder-Folder-TV-DEXTER-2-ico_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
6383196142855109799
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"Upper-Left-jpg_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
7518208176958373090
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"Upper-Right-jpg_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
10122895588403815825
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"art-jpg_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
1194865470158040918
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"baseline-jpeg-jpg_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
4163734972868667214
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"baseline-restart-jpeg-jpg_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
4163734972868667214
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"bmp-test-bmp_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
13377769522785041821
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"desk-yahoonews-0-jpg_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
11660520904814991699
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"kokteylogo-png_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
168800254427225818
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"photo-jpg-png_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
76400998740744557
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"png-test-png_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
3962535646133419277
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"progressive-jpeg-jpg_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
4163734972868667214
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"progressive-restart-jpeg-jpg_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
4163734972868667214
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"tabl-mozilla-0-jpg_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
12021873154910819088
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"webp-test-webp_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
2946264152433674804
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"webp-test-webp-[103,17,154,124]_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
8972288090774759642
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"webp-test-webp-[110,85,267,304]_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
261638602306139829
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"webp-test-webp-[223,404,562,457]_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
6408120322797303128
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"webp-test-webp-[262,269,387,328]_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
18424384439009379931
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
},
|
|
"webp-test-webp-[514,217,623,260]_8888.png" : {
|
|
"allowed-digests": [
|
|
[
|
|
"bitmap-64bitMD5",
|
|
1549338922479921698
|
|
]
|
|
],
|
|
"ignore-failure": false
|
|
}
|
|
}
|
|
} |