diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-13 14:18:40 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-13 14:18:40 +0000 |
| commit | 5efdd0cb9cdf4c2017dc6ad70b2503bf04234d9b (patch) | |
| tree | 87c0e8196b0b8453fdde805b791b27ee3ab0a10b /gm/tests/outputs | |
| parent | 530efc808544e9ff79814f61678bd919b168cb21 (diff) | |
gm: write all messages to stdout/stderr with "GM:" preamble to distinguish from various debug messages coming from elsewhere
Review URL: https://codereview.chromium.org/12691009
git-svn-id: http://skia.googlecode.com/svn/trunk@8126 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/tests/outputs')
16 files changed, 31 insertions, 25 deletions
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stderr b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stderr new file mode 100644 index 0000000000..3cf1ecdf40 --- /dev/null +++ b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stderr @@ -0,0 +1,4 @@ +GM: ---- 8888/selftest1: 60000 (of 60000) differing pixels, max per-channel mismatch R=0 G=111 B=103 A=0 +GM: ---- 565/selftest1: not computing max per-channel pixel mismatch because non-8888 +GM: 8888/selftest1 pixel_error +GM: 565/selftest1 pixel_error diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stdout b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stdout index d4b37eae40..955fa27545 100644 --- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stdout +++ b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stdout @@ -1,3 +1,3 @@ -reading from gm/tests/inputs/images/different-pixels -drawing... selftest1 [300 200] -Ran 1 tests: 0 passed, 1 failed, 0 missing reference images +GM: reading from gm/tests/inputs/images/different-pixels +GM: drawing... selftest1 [300 200] +GM: Ran 1 tests: 0 passed, 1 failed, 0 missing reference images diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stderr b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stderr new file mode 100644 index 0000000000..e30bcb8b46 --- /dev/null +++ b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stderr @@ -0,0 +1,2 @@ +GM: 8888/selftest1 pixel_error +GM: 565/selftest1 pixel_error diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stdout b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stdout index fc017a5297..ec3f59fc31 100644 --- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stdout +++ b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stdout @@ -1,3 +1,3 @@ -reading expectations from JSON summary file gm/tests/inputs/json/different-pixels.json -drawing... selftest1 [300 200] -Ran 1 tests: 0 passed, 1 failed, 0 missing reference images +GM: reading expectations from JSON summary file gm/tests/inputs/json/different-pixels.json +GM: drawing... selftest1 [300 200] +GM: Ran 1 tests: 0 passed, 1 failed, 0 missing reference images diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/stderr b/gm/tests/outputs/compared-against-empty-dir/output-expected/stderr new file mode 100644 index 0000000000..2e951cfede --- /dev/null +++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/stderr @@ -0,0 +1,2 @@ +GM: FAILED to read gm/tests/inputs/images/empty-dir/8888/selftest1.png +GM: FAILED to read gm/tests/inputs/images/empty-dir/565/selftest1.png diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout b/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout index faf12bf9a8..76a96dba2d 100644 --- a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout +++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout @@ -1,5 +1,3 @@ -reading from gm/tests/inputs/images/empty-dir -drawing... selftest1 [300 200] -FAILED to read gm/tests/inputs/images/empty-dir/8888/selftest1.png -FAILED to read gm/tests/inputs/images/empty-dir/565/selftest1.png -Ran 1 tests: 1 passed, 0 failed, 1 missing reference images +GM: reading from gm/tests/inputs/images/empty-dir +GM: drawing... selftest1 [300 200] +GM: Ran 1 tests: 1 passed, 0 failed, 1 missing reference images diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/stderr b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/stderr new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/stderr diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/stdout b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/stdout index 73148bae96..5ea8bc7521 100644 --- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/stdout +++ b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/stdout @@ -1,3 +1,3 @@ -reading from gm/tests/inputs/images/identical-bytes -drawing... selftest1 [300 200] -Ran 1 tests: 1 passed, 0 failed, 0 missing reference images +GM: reading from gm/tests/inputs/images/identical-bytes +GM: drawing... selftest1 [300 200] +GM: Ran 1 tests: 1 passed, 0 failed, 0 missing reference images diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/stderr b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/stderr new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/stderr diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/stdout b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/stdout index 82c5cacecc..b3f16b5cf5 100644 --- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/stdout +++ b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/stdout @@ -1,3 +1,3 @@ -reading expectations from JSON summary file gm/tests/inputs/json/identical-bytes.json -drawing... selftest1 [300 200] -Ran 1 tests: 1 passed, 0 failed, 0 missing reference images +GM: reading expectations from JSON summary file gm/tests/inputs/json/identical-bytes.json +GM: drawing... selftest1 [300 200] +GM: Ran 1 tests: 1 passed, 0 failed, 0 missing reference images diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/stderr b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/stderr new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/stderr diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/stdout b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/stdout index 958cd15cca..547cd9d0a4 100644 --- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/stdout +++ b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/stdout @@ -1,3 +1,3 @@ -reading from gm/tests/inputs/images/identical-pixels -drawing... selftest1 [300 200] -Ran 1 tests: 1 passed, 0 failed, 0 missing reference images +GM: reading from gm/tests/inputs/images/identical-pixels +GM: drawing... selftest1 [300 200] +GM: Ran 1 tests: 1 passed, 0 failed, 0 missing reference images diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/stderr b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/stderr new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/stderr diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/stdout b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/stdout index 302f7656c1..3ad0d0aaa6 100644 --- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/stdout +++ b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/stdout @@ -1,3 +1,3 @@ -reading expectations from JSON summary file gm/tests/inputs/json/identical-pixels.json -drawing... selftest1 [300 200] -Ran 1 tests: 1 passed, 0 failed, 0 missing reference images +GM: reading expectations from JSON summary file gm/tests/inputs/json/identical-pixels.json +GM: drawing... selftest1 [300 200] +GM: Ran 1 tests: 1 passed, 0 failed, 0 missing reference images diff --git a/gm/tests/outputs/no-readpath/output-expected/stderr b/gm/tests/outputs/no-readpath/output-expected/stderr new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/gm/tests/outputs/no-readpath/output-expected/stderr diff --git a/gm/tests/outputs/no-readpath/output-expected/stdout b/gm/tests/outputs/no-readpath/output-expected/stdout index 78a211f447..a46b605de9 100644 --- a/gm/tests/outputs/no-readpath/output-expected/stdout +++ b/gm/tests/outputs/no-readpath/output-expected/stdout @@ -1,2 +1,2 @@ -drawing... selftest1 [300 200] -Ran 1 tests: 1 passed, 0 failed, 1 missing reference images +GM: drawing... selftest1 [300 200] +GM: Ran 1 tests: 1 passed, 0 failed, 1 missing reference images |