diff options
author | 2012-12-18 19:13:49 +0000 | |
---|---|---|
committer | 2012-12-18 19:13:49 +0000 | |
commit | ee8a8e3931c1d3f39755ee8beaf0c7cb1ba91888 (patch) | |
tree | e6e974e5b8e54fe4d14f013f669bc880d6c74159 /gm/tests/outputs | |
parent | 457d8a77bed0160519fc5dfb67d0e02f9c3950a2 (diff) |
Re-land r6843 with copied gyp file to (hopefully) fix Windows build
BUG=https://code.google.com/p/skia/issues/detail?id=1023
Review URL: https://codereview.appspot.com/6943073
git-svn-id: http://skia.googlecode.com/svn/trunk@6880 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/tests/outputs')
11 files changed, 78 insertions, 3 deletions
diff --git a/gm/tests/outputs/compared-against-different-pixels/output-expected/command_line b/gm/tests/outputs/compared-against-different-pixels/output-expected/command_line index ef8c5afda4..4253e730ef 100644 --- a/gm/tests/outputs/compared-against-different-pixels/output-expected/command_line +++ b/gm/tests/outputs/compared-against-different-pixels/output-expected/command_line @@ -1 +1 @@ -out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/different-pixels -w gm/tests/outputs/compared-against-different-pixels/output-actual/images +out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/different-pixels --writeJsonSummary gm/tests/outputs/compared-against-different-pixels/output-actual/json-summary.txt -w gm/tests/outputs/compared-against-different-pixels/output-actual/images diff --git a/gm/tests/outputs/compared-against-different-pixels/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-different-pixels/output-expected/json-summary.txt new file mode 100644 index 0000000000..179c60c162 --- /dev/null +++ b/gm/tests/outputs/compared-against-different-pixels/output-expected/json-summary.txt @@ -0,0 +1,17 @@ +{ + "actual-results" : { + "failed" : { + "8888/dashing2" : { + "checksum" : 2675870163990933333 + } + }, + "failure-ignored" : null, + "succeeded" : null + }, + "expected-results" : { + "8888/dashing2" : { + "checksums" : [ 15161495552186645995 ], + "ignore-failure" : false + } + } +} diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/command_line b/gm/tests/outputs/compared-against-empty-dir/output-expected/command_line new file mode 100644 index 0000000000..0ee96beddd --- /dev/null +++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/command_line @@ -0,0 +1 @@ +out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/empty-dir --writeJsonSummary gm/tests/outputs/compared-against-empty-dir/output-actual/json-summary.txt -w gm/tests/outputs/compared-against-empty-dir/output-actual/images diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/images/8888/dashing2.png b/gm/tests/outputs/compared-against-empty-dir/output-expected/images/8888/dashing2.png Binary files differnew file mode 100644 index 0000000000..465c0199df --- /dev/null +++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/images/8888/dashing2.png diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt new file mode 100644 index 0000000000..935ba5037d --- /dev/null +++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt @@ -0,0 +1,17 @@ +{ + "actual-results" : { + "failed" : null, + "failure-ignored" : { + "8888/dashing2" : { + "checksum" : 2675870163990933333 + } + }, + "succeeded" : null + }, + "expected-results" : { + "8888/dashing2" : { + "checksums" : null, + "ignore-failure" : true + } + } +} diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/return_value b/gm/tests/outputs/compared-against-empty-dir/output-expected/return_value new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/return_value @@ -0,0 +1 @@ +0 diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout b/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout new file mode 100644 index 0000000000..436554d29e --- /dev/null +++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout @@ -0,0 +1,5 @@ +reading from gm/tests/inputs/empty-dir +writing to gm/tests/outputs/compared-against-empty-dir/output-actual/images +drawing... dashing2 [640 480] +FAILED to read gm/tests/inputs/empty-dir/8888/dashing2.png +Ran 1 tests: 0 passed, 0 failed, 1 missing reference images diff --git a/gm/tests/outputs/compared-against-identical-bytes/output-expected/command_line b/gm/tests/outputs/compared-against-identical-bytes/output-expected/command_line index 6e89999781..556498ab12 100644 --- a/gm/tests/outputs/compared-against-identical-bytes/output-expected/command_line +++ b/gm/tests/outputs/compared-against-identical-bytes/output-expected/command_line @@ -1 +1 @@ -out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/identical-bytes -w gm/tests/outputs/compared-against-identical-bytes/output-actual/images +out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/identical-bytes --writeJsonSummary gm/tests/outputs/compared-against-identical-bytes/output-actual/json-summary.txt -w gm/tests/outputs/compared-against-identical-bytes/output-actual/images diff --git a/gm/tests/outputs/compared-against-identical-bytes/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-bytes/output-expected/json-summary.txt new file mode 100644 index 0000000000..cbb28e1172 --- /dev/null +++ b/gm/tests/outputs/compared-against-identical-bytes/output-expected/json-summary.txt @@ -0,0 +1,17 @@ +{ + "actual-results" : { + "failed" : null, + "failure-ignored" : null, + "succeeded" : { + "8888/dashing2" : { + "checksum" : 2675870163990933333 + } + } + }, + "expected-results" : { + "8888/dashing2" : { + "checksums" : [ 2675870163990933333 ], + "ignore-failure" : false + } + } +} diff --git a/gm/tests/outputs/compared-against-identical-pixels/output-expected/command_line b/gm/tests/outputs/compared-against-identical-pixels/output-expected/command_line index 285cef2125..ecdef271da 100644 --- a/gm/tests/outputs/compared-against-identical-pixels/output-expected/command_line +++ b/gm/tests/outputs/compared-against-identical-pixels/output-expected/command_line @@ -1 +1 @@ -out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/identical-pixels -w gm/tests/outputs/compared-against-identical-pixels/output-actual/images +out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/identical-pixels --writeJsonSummary gm/tests/outputs/compared-against-identical-pixels/output-actual/json-summary.txt -w gm/tests/outputs/compared-against-identical-pixels/output-actual/images diff --git a/gm/tests/outputs/compared-against-identical-pixels/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-pixels/output-expected/json-summary.txt new file mode 100644 index 0000000000..cbb28e1172 --- /dev/null +++ b/gm/tests/outputs/compared-against-identical-pixels/output-expected/json-summary.txt @@ -0,0 +1,17 @@ +{ + "actual-results" : { + "failed" : null, + "failure-ignored" : null, + "succeeded" : { + "8888/dashing2" : { + "checksum" : 2675870163990933333 + } + } + }, + "expected-results" : { + "8888/dashing2" : { + "checksums" : [ 2675870163990933333 ], + "ignore-failure" : false + } + } +} |