diff options
Diffstat (limited to 'tools/tests')
10 files changed, 149 insertions, 114 deletions
diff --git a/tools/tests/rebaseline/output/all/output-expected/command_line b/tools/tests/rebaseline/output/all/output-expected/command_line index f51a2b2bbf..ac35415e1a 100644 --- a/tools/tests/rebaseline/output/all/output-expected/command_line +++ b/tools/tests/rebaseline/output/all/output-expected/command_line @@ -1 +1 @@ -python tools/rebaseline.py --dry-run --json-base-url file:nonexistent-path --tests test1 test2 +python tools/rebaseline.py --dry-run --actuals-base-url file:nonexistent-path --tests test1 test2 diff --git a/tools/tests/rebaseline/output/subset/output-expected/command_line b/tools/tests/rebaseline/output/subset/output-expected/command_line index ac278d2fc0..d66dc01761 100644 --- a/tools/tests/rebaseline/output/subset/output-expected/command_line +++ b/tools/tests/rebaseline/output/subset/output-expected/command_line @@ -1 +1 @@ -python tools/rebaseline.py --dry-run --expectations-root fake/expectations/path --json-base-url file:tools/tests/rebaseline/input/json1 --tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float +python tools/rebaseline.py --dry-run --expectations-root fake/expectations/path --actuals-base-url file:tools/tests/rebaseline/input/json1 --tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float diff --git a/tools/tests/rebaseline/output/using-json1-add-new/output-expected/command_line b/tools/tests/rebaseline/output/using-json1-add-new/output-expected/command_line index 32bd0ef9e7..9bd9539da6 100644 --- a/tools/tests/rebaseline/output/using-json1-add-new/output-expected/command_line +++ b/tools/tests/rebaseline/output/using-json1-add-new/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 --add-new +python tools/rebaseline.py --dry-run --actuals-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float --add-new 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 76293588ef..ac6be7dbd5 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 --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 +python tools/rebaseline.py --expectations-root tools/tests/rebaseline/output/using-json1-expectations/output-actual/gm-expectations --actuals-base-url 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 index d7608cd2a0..20721f3525 100644 --- 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 @@ -1,52 +1,70 @@ { - "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 - } - } -} + "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 + } + } +}
\ No newline at end of file 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 index b314ed68a4..20721f3525 100644 --- 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 @@ -1,52 +1,70 @@ { - "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 - } - } -} + "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 + } + } +}
\ No newline at end of file diff --git a/tools/tests/rebaseline/output/using-json1-expectations/output-expected/return_value b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/return_value index d00491fd7e..573541ac97 100644 --- a/tools/tests/rebaseline/output/using-json1-expectations/output-expected/return_value +++ b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/return_value @@ -1 +1 @@ -1 +0 diff --git a/tools/tests/rebaseline/output/using-json1-expectations/output-expected/stdout b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/stdout index 43c078e65c..e69de29bb2 100644 --- a/tools/tests/rebaseline/output/using-json1-expectations/output-expected/stdout +++ b/tools/tests/rebaseline/output/using-json1-expectations/output-expected/stdout @@ -1 +0,0 @@ -ERROR: JsonRebaseliner is not implemented yet. diff --git a/tools/tests/rebaseline/output/using-json1/output-expected/command_line b/tools/tests/rebaseline/output/using-json1/output-expected/command_line index 14624e14db..127846c872 100644 --- a/tools/tests/rebaseline/output/using-json1/output-expected/command_line +++ b/tools/tests/rebaseline/output/using-json1/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 +python tools/rebaseline.py --dry-run --actuals-base-url file:tools/tests/rebaseline/input/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float diff --git a/tools/tests/run.sh b/tools/tests/run.sh index 1a3f40b2a6..bbcfeb9a52 100755 --- a/tools/tests/run.sh +++ b/tools/tests/run.sh @@ -267,13 +267,13 @@ REBASELINE_INPUT=tools/tests/rebaseline/input REBASELINE_OUTPUT=tools/tests/rebaseline/output # These test the old image-file expectations. -rebaseline_images_test "--expectations-root fake/expectations/path --json-base-url file:$REBASELINE_INPUT/json1 --tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/subset" -rebaseline_images_test "--json-base-url file:nonexistent-path --tests test1 test2" "$REBASELINE_OUTPUT/all" -rebaseline_images_test "--json-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/using-json1" -rebaseline_images_test "--json-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float --add-new" "$REBASELINE_OUTPUT/using-json1-add-new" +rebaseline_images_test "--expectations-root fake/expectations/path --actuals-base-url file:$REBASELINE_INPUT/json1 --tests test1 test2 --configs 565 8888 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/subset" +rebaseline_images_test "--actuals-base-url file:nonexistent-path --tests test1 test2" "$REBASELINE_OUTPUT/all" +rebaseline_images_test "--actuals-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/using-json1" +rebaseline_images_test "--actuals-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float --add-new" "$REBASELINE_OUTPUT/using-json1-add-new" # These test the new JSON-format expectations. -rebaseline_test "$REBASELINE_INPUT/json1" "--json-base-url file:$REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/using-json1-expectations" +rebaseline_test "$REBASELINE_INPUT/json1" "--actuals-base-url $REBASELINE_INPUT/json1 --subdirs base-android-galaxy-nexus base-shuttle-win7-intel-float" "$REBASELINE_OUTPUT/using-json1-expectations" # # Test jsondiff.py ... |