GM self-tests: add testing for non --hierarchy case

GM self-tests: add testing for non --hierarchy case

R=scroggo@google.com

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

[epoger, 2013-05-19 08:06:20]

Ready for review at patchset 1.

https://codereview.chromium.org/15397007/diff/1/gm/tests/outputs/no-hierarchy...
File gm/tests/outputs/no-hierarchy/output-expected/command_line (right):

https://codereview.chromium.org/15397007/diff/1/gm/tests/outputs/no-hierarchy...
gm/tests/outputs/no-hierarchy/output-expected/command_line:1: out/Debug/gm
--verbose --match selftest1 --config 8888 565 -r
gm/tests/inputs/json/different-pixels-no-hierarchy.json --writeJsonSummaryPath
gm/tests/outputs/no-hierarchy/output-actual/json-summary.txt --writePath
gm/tests/outputs/no-hierarchy/output-actual/writePath --mismatchPath
gm/tests/outputs/no-hierarchy/output-actual/mismatchPath
Toplevel comment:

If GM can function both with and without the --hierarchy flag, we should test it
both ways.  I especially wanted to add this test now, to make sure I don't break
anything with https://codereview.chromium.org/15415003/ ('GM: add option to
write out image files with checksum-based filenames')

https://codereview.chromium.org/15397007/diff/1/gm/tests/outputs/no-hierarchy...
File gm/tests/outputs/no-hierarchy/output-expected/json-summary.txt (right):

https://codereview.chromium.org/15397007/diff/1/gm/tests/outputs/no-hierarchy...
gm/tests/outputs/no-hierarchy/output-expected/json-summary.txt:1: {
confirmation that this is correct:

$ diff
gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt
gm/tests/outputs/no-hierarchy/output-expected/json-summary.txt 
4c4
<          "565/selftest1.png" : {
---
>          "selftest1_565.png" : {
7c7
<          "8888/selftest1.png" : {
---
>          "selftest1_8888.png" : {
16c16
<       "565/selftest1.png" : {
---
>       "selftest1_565.png" : {
20c20
<       "8888/selftest1.png" : {
---
>       "selftest1_8888.png" : {

https://codereview.chromium.org/15397007/diff/1/gm/tests/outputs/no-hierarchy...
File gm/tests/outputs/no-hierarchy/output-expected/stdout (right):

https://codereview.chromium.org/15397007/diff/1/gm/tests/outputs/no-hierarchy...
gm/tests/outputs/no-hierarchy/output-expected/stdout:1: GM: These configs will
be run: 8888 565
Confirmation that this is correct:

$ diff
gm/tests/outputs/compared-against-different-pixels-json/output-expected/stdout
gm/tests/outputs/no-hierarchy/output-expected/stdout
2,4c2,4
< GM: reading expectations from JSON summary file
gm/tests/inputs/json/different-pixels.json
< GM: writing to
gm/tests/outputs/compared-against-different-pixels-json/output-actual/writePath
< GM: writing mismatches to
gm/tests/outputs/compared-against-different-pixels-json/output-actual/mismatchPath
---
> GM: reading expectations from JSON summary file
gm/tests/inputs/json/different-pixels-no-hierarchy.json
> GM: writing to gm/tests/outputs/no-hierarchy/output-actual/writePath
> GM: writing mismatches to
gm/tests/outputs/no-hierarchy/output-actual/mismatchPath
14c14
< GM: [*] 2 ExpectationsMismatch: 8888/selftest1 565/selftest1
---
> GM: [*] 2 ExpectationsMismatch: selftest1_8888 selftest1_565

[scroggo, 2013-05-20 17:22:03]

lgtm

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

https://codereview.chromium.org/15397007/diff/1/gm/tests/run.sh#newcode168
gm/tests/run.sh:168: mkdir -p $IMAGES_DIR/different-pixels-no-hierarchy
Should there be a variable set to different-pixels-no-hierarchy?

[epoger, 2013-05-21 15:41:23]

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

https://codereview.chromium.org/15397007/diff/1/gm/tests/run.sh#newcode168
gm/tests/run.sh:168: mkdir -p $IMAGES_DIR/different-pixels-no-hierarchy
On 2013/05/20 17:22:03, scroggo wrote:
> Should there be a variable set to different-pixels-no-hierarchy?

Great idea, thanks!  Done throughout this function.

[epoger, 2013-05-21 15:41:41]

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