diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-03 17:43:11 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-03 17:43:11 +0000 |
| commit | 34b73a2da18f9c1ee01ca716a2e5a4ea0fa3ace4 (patch) | |
| tree | a4719627660df29ddb37f485129ed9edff03fd7d /tools/tests/rebaseline | |
| parent | 1d65e87ec874063c3c1393122a5f20dd5feeb722 (diff) | |
rebaseline.py self-tests: prepare to add tests of JSON-format rebaselining
For now, rebaseline.py still does not support JSON-format rebaselining, so
the one self-test reports failure. But this change will allow us to test
the JSON-format rebaselining once rebaseline.py supports it.
R=scroggo@google.com
Review URL: https://codereview.chromium.org/18348015
git-svn-id: http://skia.googlecode.com/svn/trunk@9896 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools/tests/rebaseline')
4 files changed, 131 insertions, 1 deletions
diff --git a/tools/tests/rebaseline/output/using-json1-expectations/output-expected/command_line b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/command_line index 9530f18c3e..76293588ef 100644 --- a/tools/tests/rebaseline/output/using-json1-expectations/output-expected/command_line +++ b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/command_line @@ -1 +1 @@ -python tools/rebaseline.py --dry-run --json-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float --expectations-root tools/tests/rebaseline/input/json1 +python tools/rebaseline.py --expectations-root tools/tests/rebaseline/output/using-json1-expectations/output-actual/gm-expectations --json-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float diff --git a/tools/tests/rebaseline/output/using-json1-expectations/output-expected/gm-expectations/base-android-galaxy-nexus/expected-results.json b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/gm-expectations/base-android-galaxy-nexus/expected-results.json new file mode 100644 index 0000000000..d7608cd2a0 --- /dev/null +++ b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/gm-expectations/base-android-galaxy-nexus/expected-results.json @@ -0,0 +1,52 @@ +{ + "expected-results" : { + "3x3bitmaprect_565.png" : { + "allowed-digests" : null, + "ignore-failure" : false + }, + "3x3bitmaprect_8888.png" : { + "allowed-digests" : null, + "ignore-failure" : false + }, + "aaclip_gpu.png" : { + "allowed-digests" : [ + [ "bitmap-64bitMD5", 11899819492385205974 ] + ], + "ignore-failure" : false + }, + "aarectmodes_565.png" : { + "allowed-digests" : [ + [ "bitmap-64bitMD5", 14760033689012826769 ] + ], + "ignore-failure" : false + }, + "imageblur_565.png" : { + "allowed-digests" : [ + [ "bitmap-64bitMD5", 17796243856503591523 ] + ], + "ignore-failure" : false + }, + "imageblur_8888.png" : { + "allowed-digests" : [ + [ "bitmap-64bitMD5", 7426416989687670152 ] + ], + "ignore-failure" : false + }, + "shadertext3_8888.png" : { + "allowed-digests" : [ + [ "bitmap-64bitMD5", 10593797161686785561 ] + ], + "ignore-failure" : false + }, + "xfermodeimagefilter_pdf.png" : { + "allowed-digests" : null, + "ignore-failure" : false + }, + "xfermodes_pdf.png" : { + "allowed-digests" : [ + [ "bitmap-64bitMD5", 9151974350149210736 ] + ], + "ignore-failure" : false + } + } +} diff --git a/tools/tests/rebaseline/output/using-json1-expectations/output-expected/gm-expectations/base-macmini/expected-results.json b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/gm-expectations/base-macmini/expected-results.json new file mode 100644 index 0000000000..79af0cf5e7 --- /dev/null +++ b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/gm-expectations/base-macmini/expected-results.json @@ -0,0 +1,26 @@ +{ + "expected-results" : { + "aaclip_565.png" : { + "allowed-digests" : [ + [ "bitmap-64bitMD5", 12345 ] + ], + "ignore-failure" : false + }, + "aaclip_8888.png" : { + "allowed-digests" : [ + [ "bitmap-64bitMD5", 67890 ] + ], + "ignore-failure" : false + }, + "aaclip_gpu.png" : { + "allowed-digests" : [ + [ "bitmap-64bitMD5", 11899819492385205974 ] + ], + "ignore-failure" : false + }, + "aaclip_pdf.png" : { + "allowed-digests" : null, + "ignore-failure" : false + } + } +} diff --git a/tools/tests/rebaseline/output/using-json1-expectations/output-expected/gm-expectations/base-shuttle-win7-intel-float/expected-results.json b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/gm-expectations/base-shuttle-win7-intel-float/expected-results.json new file mode 100644 index 0000000000..b314ed68a4 --- /dev/null +++ b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/gm-expectations/base-shuttle-win7-intel-float/expected-results.json @@ -0,0 +1,52 @@ +{ + "expected-results" : { + "3x3bitmaprect_565.png" : { + "allowed-digests" : null, + "ignore-failure" : false + }, + "3x3bitmaprect_8888.png" : { + "allowed-digests" : null, + "ignore-failure" : false + }, + "aaclip_gpu.png" : { + "allowed-digests" : [ + [ "bitmap-64bitMD5", 11899819492385205974 ] + ], + "ignore-failure" : false + }, + "aarectmodes_565.png" : { + "allowed-digests" : [ + [ "bitmap-64bitMD5", 14760033689012826769 ] + ], + "ignore-failure" : false + }, + "imageblur_565.png" : { + "allowed-digests" : [ + [ "bitmap-64bitMD5", 3359963596899141322 ] + ], + "ignore-failure" : false + }, + "imageblur_8888.png" : { + "allowed-digests" : [ + [ "bitmap-64bitMD5", 4217923806027861152 ] + ], + "ignore-failure" : false + }, + "shadertext3_8888.png" : { + "allowed-digests" : [ + [ "bitmap-64bitMD5", 3713708307125704716 ] + ], + "ignore-failure" : false + }, + "xfermodeimagefilter_pdf.png" : { + "allowed-digests" : null, + "ignore-failure" : false + }, + "xfermodes_pdf.png" : { + "allowed-digests" : [ + [ "bitmap-64bitMD5", 9151974350149210736 ] + ], + "ignore-failure" : false + } + } +} |