rebaseline.py: if expectations dir contains JSON format results, update those instead of image files
Part of Step 3 in https://goto.google.com/ChecksumTransitionDetail
R=senorblanco@chromium.org
Review URL: https://codereview.chromium.org/18348018
git-svn-id: http://skia.googlecode.com/svn/trunk@9910 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tools/tests/rebaseline/output/all/output-expected/command_line b/tools/tests/rebaseline/output/all/output-expected/command_line
index f51a2b2..ac35415 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 ac278d2..d66dc01 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 32bd0ef..9bd9539 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 7629358..ac6be7d 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 d7608cd..20721f3 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 b314ed6..20721f3 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 d00491f..573541a 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 43c078e..e69de29 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 14624e1..127846c 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 1a3f40b..bbcfeb9 100755
--- a/tools/tests/run.sh
+++ b/tools/tests/run.sh
@@ -267,13 +267,13 @@
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 ...