rebaseline.py self-tests: prepare to add tests of JSON-format rebaselining

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

Committed: https://code.google.com/p/skia/source/detail?r=9896

[epoger, 2013-07-03 17:00:07]

Ready for review at patchset 2.

https://codereview.chromium.org/18348015/diff/1/tools/tests/rebaseline/output...
File
tools/tests/rebaseline/output/using-json1-expectations/output-expected/command_line
(right):

https://codereview.chromium.org/18348015/diff/1/tools/tests/rebaseline/output...
tools/tests/rebaseline/output/using-json1-expectations/output-expected/command_line: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
--expectations-root now points at the directory which will be automatically
populated with expected-results.json files, ready to modify in place (like
humans do with rebaseline.py)

https://codereview.chromium.org/18348015/diff/1/tools/tests/rebaseline/output...
File
tools/tests/rebaseline/output/using-json1-expectations/output-expected/gm-expectations/base-android-galaxy-nexus/expected-results.json
(right):

https://codereview.chromium.org/18348015/diff/1/tools/tests/rebaseline/output...
tools/tests/rebaseline/output/using-json1-expectations/output-expected/gm-expectations/base-android-galaxy-nexus/expected-results.json:2:
"expected-results" : {
Contents of this file are identical to the original, because rebaseline.py
doesn't know how to modify JSON-format expectations yet.

$ sum
tools/tests/rebaseline/input/json1/base-android-galaxy-nexus/expected-results.json
tools/tests/rebaseline/output/using-json1-expectations/output-expected/gm-expectations/base-android-galaxy-nexus/expected-results.json

17293     2
tools/tests/rebaseline/input/json1/base-android-galaxy-nexus/expected-results.json
17293     2
tools/tests/rebaseline/output/using-json1-expectations/output-expected/gm-expectations/base-android-galaxy-nexus/expected-results.json

https://codereview.chromium.org/18348015/diff/1/tools/tests/run.sh
File tools/tests/run.sh (right):

https://codereview.chromium.org/18348015/diff/1/tools/tests/run.sh#newcode42
tools/tests/run.sh:42: diff --recursive --exclude=.* $1 $2
Gotta do this so we compare the expected-results.json files within the new
gm-expectations subdir.

[scroggo, 2013-07-03 17:39:32]

lgtm

[epoger, 2013-07-03 17:43:13]

Committed patchset #2 manually as r9896 (presubmit successful).