diff options
17 files changed, 34 insertions, 17 deletions
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/stdout b/gm/tests/outputs/add-config-pdf/output-expected/stdout index 355feea567..fef69b1040 100644 --- a/gm/tests/outputs/add-config-pdf/output-expected/stdout +++ b/gm/tests/outputs/add-config-pdf/output-expected/stdout @@ -9,10 +9,11 @@ GM: Ran 1 GMs GM: ... over 3 configs ["8888", "565", "pdf"] GM: ... and 0 modes [] GM: ... so there should be a total of 3 tests. -GM: Ran 3 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=0 MissingExpectations=1 WritingReferenceImage=0 +GM: Ran 3 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=0 MissingExpectations=1 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [*] 0 ExpectationsMismatch: GM: [ ] 1 MissingExpectations: pdf/selftest1 GM: [*] 0 WritingReferenceImage: diff --git a/gm/tests/outputs/checksum-based-filenames/output-expected/stdout b/gm/tests/outputs/checksum-based-filenames/output-expected/stdout index 1e9702acec..de226fa02e 100644 --- a/gm/tests/outputs/checksum-based-filenames/output-expected/stdout +++ b/gm/tests/outputs/checksum-based-filenames/output-expected/stdout @@ -8,10 +8,11 @@ GM: Ran 1 GMs GM: ... over 2 configs ["8888", "565"] GM: ... and 0 modes [] GM: ... so there should be a total of 2 tests. -GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0 +GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [*] 2 ExpectationsMismatch: selftest1_8888 selftest1_565 GM: [ ] 0 MissingExpectations: GM: [*] 0 WritingReferenceImage: 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 3d81f5a645..ab704660dc 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 @@ -8,10 +8,11 @@ GM: Ran 1 GMs GM: ... over 2 configs ["8888", "565"] GM: ... and 0 modes [] GM: ... so there should be a total of 2 tests. -GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0 +GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [*] 2 ExpectationsMismatch: 8888/selftest1 565/selftest1 GM: [ ] 0 MissingExpectations: GM: [*] 0 WritingReferenceImage: 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 a63c8c7227..886d2f33c4 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 @@ -8,10 +8,11 @@ GM: Ran 1 GMs GM: ... over 2 configs ["8888", "565"] GM: ... and 0 modes [] GM: ... so there should be a total of 2 tests. -GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0 +GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [*] 2 ExpectationsMismatch: 8888/selftest1 565/selftest1 GM: [ ] 0 MissingExpectations: GM: [*] 0 WritingReferenceImage: 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 2ba4a56385..f64e83735f 100644 --- a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout +++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout @@ -8,10 +8,11 @@ GM: Ran 1 GMs GM: ... over 2 configs ["8888", "565"] GM: ... and 0 modes [] GM: ... so there should be a total of 2 tests. -GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=0 MissingExpectations=2 WritingReferenceImage=0 +GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=0 MissingExpectations=2 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [*] 0 ExpectationsMismatch: GM: [ ] 2 MissingExpectations: 8888/selftest1 565/selftest1 GM: [*] 0 WritingReferenceImage: 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 08ede71446..c34de49b5d 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 @@ -8,10 +8,11 @@ GM: Ran 1 GMs GM: ... over 2 configs ["8888", "565"] GM: ... and 0 modes [] GM: ... so there should be a total of 2 tests. -GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=0 MissingExpectations=0 WritingReferenceImage=0 +GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=0 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [*] 0 ExpectationsMismatch: GM: [ ] 0 MissingExpectations: GM: [*] 0 WritingReferenceImage: 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 8e77245c98..b048163b0e 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 @@ -8,10 +8,11 @@ GM: Ran 1 GMs GM: ... over 2 configs ["8888", "565"] GM: ... and 0 modes [] GM: ... so there should be a total of 2 tests. -GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=0 MissingExpectations=0 WritingReferenceImage=0 +GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=0 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [*] 0 ExpectationsMismatch: GM: [ ] 0 MissingExpectations: GM: [*] 0 WritingReferenceImage: 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 45fa206453..1fdc76e0c2 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 @@ -8,10 +8,11 @@ GM: Ran 1 GMs GM: ... over 2 configs ["8888", "565"] GM: ... and 0 modes [] GM: ... so there should be a total of 2 tests. -GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=0 MissingExpectations=0 WritingReferenceImage=0 +GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=0 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [*] 0 ExpectationsMismatch: GM: [ ] 0 MissingExpectations: GM: [*] 0 WritingReferenceImage: 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 047d9facce..97edbfabb0 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 @@ -8,10 +8,11 @@ GM: Ran 1 GMs GM: ... over 2 configs ["8888", "565"] GM: ... and 0 modes [] GM: ... so there should be a total of 2 tests. -GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=0 MissingExpectations=0 WritingReferenceImage=0 +GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=0 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [*] 0 ExpectationsMismatch: GM: [ ] 0 MissingExpectations: GM: [*] 0 WritingReferenceImage: diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout index 097b9b7b5a..9cb4de613f 100644 --- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout +++ b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout @@ -8,10 +8,11 @@ GM: Ran 1 GMs GM: ... over 2 configs ["8888", "565"] GM: ... and 0 modes [] GM: ... so there should be a total of 2 tests. -GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0 +GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0 GM: [ ] 0 NoGpuContext: GM: [*] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [ ] 2 ExpectationsMismatch: 8888/selftest1 565/selftest1 GM: [*] 0 MissingExpectations: GM: [*] 0 WritingReferenceImage: diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/stdout b/gm/tests/outputs/ignoring-one-test/output-expected/stdout index ed498dd621..fbad896ed3 100644 --- a/gm/tests/outputs/ignoring-one-test/output-expected/stdout +++ b/gm/tests/outputs/ignoring-one-test/output-expected/stdout @@ -8,10 +8,11 @@ GM: Ran 1 GMs GM: ... over 2 configs ["8888", "565"] GM: ... and 0 modes [] GM: ... so there should be a total of 2 tests. -GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0 +GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [*] 2 ExpectationsMismatch: 8888/selftest1 565/selftest1 GM: [ ] 0 MissingExpectations: GM: [*] 0 WritingReferenceImage: diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/stdout b/gm/tests/outputs/ignoring-some-failures/output-expected/stdout index e10a02aeb2..e0b5eb47bc 100644 --- a/gm/tests/outputs/ignoring-some-failures/output-expected/stdout +++ b/gm/tests/outputs/ignoring-some-failures/output-expected/stdout @@ -8,10 +8,11 @@ GM: Ran 1 GMs GM: ... over 2 configs ["8888", "565"] GM: ... and 0 modes [] GM: ... so there should be a total of 2 tests. -GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0 +GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [*] 2 ExpectationsMismatch: 8888/selftest1 565/selftest1 GM: [ ] 0 MissingExpectations: GM: [*] 0 WritingReferenceImage: diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/stdout b/gm/tests/outputs/intentionally-skipped-tests/output-expected/stdout index 85bb0ce651..debb48855c 100644 --- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/stdout +++ b/gm/tests/outputs/intentionally-skipped-tests/output-expected/stdout @@ -8,10 +8,11 @@ GM: Ran 2 GMs GM: ... over 2 configs ["8888", "565"] GM: ... and 0 modes [] GM: ... so there should be a total of 4 tests. -GM: Ran 4 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=0 MissingExpectations=4 WritingReferenceImage=0 +GM: Ran 4 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=0 MissingExpectations=4 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [*] 0 ExpectationsMismatch: GM: [ ] 4 MissingExpectations: 8888/selftest2 565/selftest2 8888/selftest1 565/selftest1 GM: [*] 0 WritingReferenceImage: diff --git a/gm/tests/outputs/no-hierarchy/output-expected/stdout b/gm/tests/outputs/no-hierarchy/output-expected/stdout index ab0ab3fbad..65d26adcd4 100644 --- a/gm/tests/outputs/no-hierarchy/output-expected/stdout +++ b/gm/tests/outputs/no-hierarchy/output-expected/stdout @@ -8,10 +8,11 @@ GM: Ran 1 GMs GM: ... over 2 configs ["8888", "565"] GM: ... and 0 modes [] GM: ... so there should be a total of 2 tests. -GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0 +GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=2 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [*] 2 ExpectationsMismatch: selftest1_8888 selftest1_565 GM: [ ] 0 MissingExpectations: GM: [*] 0 WritingReferenceImage: diff --git a/gm/tests/outputs/no-readpath/output-expected/stdout b/gm/tests/outputs/no-readpath/output-expected/stdout index 7cd3cf2fe1..bab30e6ae2 100644 --- a/gm/tests/outputs/no-readpath/output-expected/stdout +++ b/gm/tests/outputs/no-readpath/output-expected/stdout @@ -7,10 +7,11 @@ GM: Ran 1 GMs GM: ... over 2 configs ["8888", "565"] GM: ... and 0 modes [] GM: ... so there should be a total of 2 tests. -GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=0 MissingExpectations=2 WritingReferenceImage=0 +GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=0 MissingExpectations=2 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [*] 0 ExpectationsMismatch: GM: [ ] 2 MissingExpectations: 8888/selftest1 565/selftest1 GM: [*] 0 WritingReferenceImage: diff --git a/gm/tests/outputs/nonverbose/output-expected/stdout b/gm/tests/outputs/nonverbose/output-expected/stdout index 6ce9841b30..8d35d20244 100644 --- a/gm/tests/outputs/nonverbose/output-expected/stdout +++ b/gm/tests/outputs/nonverbose/output-expected/stdout @@ -1,9 +1,10 @@ GM: These configs will be run: 8888 565 GM: drawing... selftest1 [300 200] -GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=0 MissingExpectations=2 WritingReferenceImage=0 +GM: Ran 2 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=0 MissingExpectations=2 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped GM: [*] 0 RenderModeMismatch: +GM: [*] 0 GeneratePdfFailed: GM: [*] 0 ExpectationsMismatch: GM: [ ] 2 MissingExpectations GM: [*] 0 WritingReferenceImage: diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/stdout b/gm/tests/outputs/pipe-playback-failure/output-expected/stdout index f2a253a022..b5c45830af 100644 --- a/gm/tests/outputs/pipe-playback-failure/output-expected/stdout +++ b/gm/tests/outputs/pipe-playback-failure/output-expected/stdout @@ -8,10 +8,11 @@ GM: Ran 1 GMs GM: ... over 2 configs ["8888", "565"] GM: ... and 1 modes ["pipe"] GM: ... so there should be a total of 3 tests. -GM: Ran 3 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=1 ExpectationsMismatch=0 MissingExpectations=0 WritingReferenceImage=0 +GM: Ran 3 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=1 GeneratePdfFailed=0 ExpectationsMismatch=0 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 1 RenderModeMismatch: comparison/selftest1-pipe +GM: [*] 0 GeneratePdfFailed: GM: [*] 0 ExpectationsMismatch: GM: [ ] 0 MissingExpectations: GM: [*] 0 WritingReferenceImage: |