diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-12 14:11:21 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-12 14:11:21 +0000 |
| commit | 5079d2c2a0dc0deacecccc6ef9d1c45c6c7982e4 (patch) | |
| tree | 0e3731f6b52e86729e194417eb3d4a32717a11b3 /gm/tests/outputs | |
| parent | 3c5ec8df2cf15aba7eb96dfed405a74fa5c30681 (diff) | |
GM: allow caller to specify which result types trigger an error
Review URL: https://codereview.chromium.org/14187007
git-svn-id: http://skia.googlecode.com/svn/trunk@8652 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/tests/outputs')
5 files changed, 41 insertions, 0 deletions
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/command_line b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/command_line new file mode 100644 index 0000000000..f8ffbc8077 --- /dev/null +++ b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/command_line @@ -0,0 +1 @@ +out/Debug/gm --ignoreErrorTypes ExpectationsMismatch NoGpuContext --verbose --hierarchy --match selftest1 --config 8888 565 -r gm/tests/inputs/json/different-pixels.json --writeJsonSummaryPath gm/tests/outputs/ignore-expectations-mismatch/output-actual/json-summary.txt diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt new file mode 100644 index 0000000000..4cfe15127b --- /dev/null +++ b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt @@ -0,0 +1,25 @@ +{ + "actual-results" : { + "failed" : { + "565/selftest1" : { + "checksum" : 9512553915271796906 + }, + "8888/selftest1" : { + "checksum" : 14022967492765711532 + } + }, + "failure-ignored" : null, + "no-comparison" : null, + "succeeded" : null + }, + "expected-results" : { + "565/selftest1" : { + "checksums" : [ 11071285354315388429 ], + "ignore-failure" : false + }, + "8888/selftest1" : { + "checksums" : [ 16527650414256125612 ], + "ignore-failure" : false + } + } +} diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/return_value b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/return_value new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/return_value @@ -0,0 +1 @@ +0 diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stderr b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stderr new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stderr diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout new file mode 100644 index 0000000000..881c12145a --- /dev/null +++ b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout @@ -0,0 +1,14 @@ +GM: reading expectations from JSON summary file gm/tests/inputs/json/different-pixels.json +GM: drawing... selftest1 [300 200] +GM: Ran 1 GMs +GM: ... over 2 configs ["8888", "565"] +GM: ... and 7 modes ["pipe", "pipe cross-process", "pipe cross-process, shared address", "replay", "rtree", "serialize", "tilegrid"] +GM: ... so there should be a total of 9 tests. +GM: Ran 9 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0 +GM: [ ] 0 NoGpuContext: +GM: [*] 0 IntentionallySkipped: +GM: [*] 0 RenderModeMismatch: +GM: [ ] 2 ExpectationsMismatch: 8888/selftest1 565/selftest1 +GM: [*] 0 MissingExpectations: +GM: [*] 0 WritingReferenceImage: +GM: (results marked with [*] will cause nonzero return value) |