From 1a7e09e2dd20212ad817a48847dfe84b73fce3ff Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 19 Sep 2013 05:25:17 +0000 Subject: [PATCH] gm: temporarily re-enable multiple rendermodes, to make sure they haven't regressed BUG=skia:1641 Review URL: https://codereview.chromium.org/24153020 git-svn-id: http://skia.googlecode.com/svn/trunk@11371 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm/gmmain.cpp | 12 ++++++------ .../outputs/add-config-pdf/output-expected/stdout | 6 +++--- .../checksum-based-filenames/output-expected/stdout | 6 +++--- .../output-expected/stdout | 6 +++--- .../output-expected/stdout | 6 +++--- .../output-expected/stdout | 6 +++--- .../output-expected/stdout | 6 +++--- .../output-expected/stdout | 6 +++--- .../output-expected/stdout | 6 +++--- .../output-expected/stdout | 6 +++--- .../output-expected/stdout | 6 +++--- .../ignoring-some-failures/output-expected/stdout | 6 +++--- .../output-expected/stdout | 8 ++++---- gm/tests/outputs/no-hierarchy/output-expected/stdout | 6 +++--- gm/tests/outputs/no-readpath/output-expected/stdout | 6 +++--- gm/tests/outputs/nonverbose/output-expected/stdout | 2 +- .../output-expected/command_line | 2 +- .../pipe-playback-failure/output-expected/stdout | 6 +++--- gm/tests/run.sh | 2 +- 19 files changed, 55 insertions(+), 55 deletions(-) diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index 4939624055..8eb9889981 100644 --- a/gm/gmmain.cpp +++ b/gm/gmmain.cpp @@ -1367,7 +1367,7 @@ static SkString pdfRasterizerUsage() { // Alphabetized ignoring "no" prefix ("readPath", "noreplay", "resourcePath"). DEFINE_string(config, "", configUsage().c_str()); DEFINE_string(pdfRasterizers, "", pdfRasterizerUsage().c_str()); -DEFINE_bool(deferred, false, "Exercise the deferred rendering test pass."); +DEFINE_bool(deferred, true, "Exercise the deferred rendering test pass."); DEFINE_string(excludeConfig, "", "Space delimited list of configs to skip."); DEFINE_bool(forceBWtext, false, "Disable text anti-aliasing."); #if SK_SUPPORT_GPU @@ -1395,16 +1395,16 @@ DEFINE_string(mismatchPath, "", "Write images for tests that failed due to " DEFINE_string(modulo, "", "[--modulo ]: only run tests for which " "testIndex %% divisor == remainder."); DEFINE_bool(pdf, true, "Exercise the pdf rendering test pass."); -DEFINE_bool(pipe, false, "Exercise the SkGPipe replay test pass."); +DEFINE_bool(pipe, true, "Exercise the SkGPipe replay test pass."); DEFINE_string2(readPath, r, "", "Read reference images from this dir, and report " "any differences between those and the newly generated ones."); -DEFINE_bool(replay, false, "Exercise the SkPicture replay test pass."); +DEFINE_bool(replay, true, "Exercise the SkPicture replay test pass."); DEFINE_string2(resourcePath, i, "", "Directory that stores image resources."); -DEFINE_bool(rtree, false, "Exercise the R-Tree variant of SkPicture test pass."); -DEFINE_bool(serialize, false, "Exercise the SkPicture serialization & deserialization test pass."); +DEFINE_bool(rtree, true, "Exercise the R-Tree variant of SkPicture test pass."); +DEFINE_bool(serialize, true, "Exercise the SkPicture serialization & deserialization test pass."); DEFINE_bool(simulatePipePlaybackFailure, false, "Simulate a rendering failure in pipe mode only."); DEFINE_bool(tiledPipe, false, "Exercise tiled SkGPipe replay."); -DEFINE_bool(tileGrid, false, "Exercise the tile grid variant of SkPicture."); +DEFINE_bool(tileGrid, true, "Exercise the tile grid variant of SkPicture."); DEFINE_string(tileGridReplayScales, "", "Space separated list of floating-point scale " "factors to be used for tileGrid playback testing. Default value: 1.0"); DEFINE_bool2(verbose, v, false, "Give more detail (e.g. list all GMs run, more info about " diff --git a/gm/tests/outputs/add-config-pdf/output-expected/stdout b/gm/tests/outputs/add-config-pdf/output-expected/stdout index 355feea567..0a1bda0707 100644 --- a/gm/tests/outputs/add-config-pdf/output-expected/stdout +++ b/gm/tests/outputs/add-config-pdf/output-expected/stdout @@ -7,9 +7,9 @@ GM: writing images without expectations to gm/tests/outputs/add-config-pdf/outpu GM: drawing... selftest1 [300 200] 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: ... and 7 modes ["pipe", "pipe cross-process", "pipe cross-process, shared address", "replay", "rtree", "serialize", "tilegrid"] +GM: ... so there should be a total of 10 tests. +GM: Ran 10 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=0 MissingExpectations=1 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: diff --git a/gm/tests/outputs/checksum-based-filenames/output-expected/stdout b/gm/tests/outputs/checksum-based-filenames/output-expected/stdout index 1e9702acec..05d4a599d8 100644 --- a/gm/tests/outputs/checksum-based-filenames/output-expected/stdout +++ b/gm/tests/outputs/checksum-based-filenames/output-expected/stdout @@ -6,9 +6,9 @@ GM: writing images without expectations to gm/tests/outputs/checksum-based-filen GM: drawing... selftest1 [300 200] 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: ... 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: 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..3513a424ac 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 @@ -6,9 +6,9 @@ GM: writing images without expectations to gm/tests/outputs/compared-against-dif GM: drawing... selftest1 [300 200] 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: ... 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: 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..db69c300af 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 @@ -6,9 +6,9 @@ GM: writing images without expectations to gm/tests/outputs/compared-against-dif GM: drawing... selftest1 [300 200] 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: ... 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: 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..de58e0ea33 100644 --- a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout +++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout @@ -6,9 +6,9 @@ GM: writing images without expectations to gm/tests/outputs/compared-against-emp GM: drawing... selftest1 [300 200] 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: ... 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=0 MissingExpectations=2 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: 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..30ea8b1eb4 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 @@ -6,9 +6,9 @@ GM: writing images without expectations to gm/tests/outputs/compared-against-ide GM: drawing... selftest1 [300 200] 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: ... 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=0 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: 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..19f8a77ea3 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 @@ -6,9 +6,9 @@ GM: writing images without expectations to gm/tests/outputs/compared-against-ide GM: drawing... selftest1 [300 200] 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: ... 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=0 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: 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..a9b3653292 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 @@ -6,9 +6,9 @@ GM: writing images without expectations to gm/tests/outputs/compared-against-ide GM: drawing... selftest1 [300 200] 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: ... 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=0 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: 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..7a028098f7 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 @@ -6,9 +6,9 @@ GM: writing images without expectations to gm/tests/outputs/compared-against-ide GM: drawing... selftest1 [300 200] 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: ... 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=0 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout index 097b9b7b5a..646c05127d 100644 --- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout +++ b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout @@ -6,9 +6,9 @@ GM: writing images without expectations to gm/tests/outputs/ignore-expectations- GM: drawing... selftest1 [300 200] 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: ... 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: diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/stdout b/gm/tests/outputs/ignoring-some-failures/output-expected/stdout index e10a02aeb2..02859bb2d1 100644 --- a/gm/tests/outputs/ignoring-some-failures/output-expected/stdout +++ b/gm/tests/outputs/ignoring-some-failures/output-expected/stdout @@ -6,9 +6,9 @@ GM: writing images without expectations to gm/tests/outputs/ignoring-some-failur GM: drawing... selftest1 [300 200] 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: ... 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: diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/stdout b/gm/tests/outputs/intentionally-skipped-tests/output-expected/stdout index 85bb0ce651..31ae218899 100644 --- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/stdout +++ b/gm/tests/outputs/intentionally-skipped-tests/output-expected/stdout @@ -6,11 +6,11 @@ GM: drawing... selftest2 [300 200] GM: drawing... selftest1 [300 200] 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: ... and 7 modes ["pipe", "pipe cross-process", "pipe cross-process, shared address", "replay", "rtree", "serialize", "tilegrid"] +GM: ... so there should be a total of 18 tests. +GM: Ran 18 tests: NoGpuContext=0 IntentionallySkipped=3 RenderModeMismatch=0 ExpectationsMismatch=0 MissingExpectations=4 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: -GM: [ ] 0 IntentionallySkipped: +GM: [ ] 3 IntentionallySkipped: comparison/selftest2-pipe comparison/selftest2-pipe cross-process comparison/selftest2-pipe cross-process, shared address GM: [*] 0 RenderModeMismatch: GM: [*] 0 ExpectationsMismatch: GM: [ ] 4 MissingExpectations: 8888/selftest2 565/selftest2 8888/selftest1 565/selftest1 diff --git a/gm/tests/outputs/no-hierarchy/output-expected/stdout b/gm/tests/outputs/no-hierarchy/output-expected/stdout index ab0ab3fbad..dffd3c8cc6 100644 --- a/gm/tests/outputs/no-hierarchy/output-expected/stdout +++ b/gm/tests/outputs/no-hierarchy/output-expected/stdout @@ -6,9 +6,9 @@ GM: writing images without expectations to gm/tests/outputs/no-hierarchy/output- GM: drawing... selftest1 [300 200] 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: ... 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: diff --git a/gm/tests/outputs/no-readpath/output-expected/stdout b/gm/tests/outputs/no-readpath/output-expected/stdout index 7cd3cf2fe1..688e5b9759 100644 --- a/gm/tests/outputs/no-readpath/output-expected/stdout +++ b/gm/tests/outputs/no-readpath/output-expected/stdout @@ -5,9 +5,9 @@ GM: writing images without expectations to gm/tests/outputs/no-readpath/output-a GM: drawing... selftest1 [300 200] 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: ... 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=0 MissingExpectations=2 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 0 RenderModeMismatch: diff --git a/gm/tests/outputs/nonverbose/output-expected/stdout b/gm/tests/outputs/nonverbose/output-expected/stdout index 6ce9841b30..dc59708a42 100644 --- a/gm/tests/outputs/nonverbose/output-expected/stdout +++ b/gm/tests/outputs/nonverbose/output-expected/stdout @@ -1,6 +1,6 @@ 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 9 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 ExpectationsMismatch=0 MissingExpectations=2 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped GM: [*] 0 RenderModeMismatch: diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/command_line b/gm/tests/outputs/pipe-playback-failure/output-expected/command_line index b9aade2d87..60f36dd015 100644 --- a/gm/tests/outputs/pipe-playback-failure/output-expected/command_line +++ b/gm/tests/outputs/pipe-playback-failure/output-expected/command_line @@ -1 +1 @@ -out/Debug/gm --pipe --simulatePipePlaybackFailure --verbose --hierarchy --match selftest1 --config 8888 565 -r gm/tests/inputs/json/identical-pixels.json --writeJsonSummaryPath gm/tests/outputs/pipe-playback-failure/output-actual/json-summary.txt --writePath gm/tests/outputs/pipe-playback-failure/output-actual/writePath --mismatchPath gm/tests/outputs/pipe-playback-failure/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/pipe-playback-failure/output-actual/missingExpectationsPath +out/Debug/gm --simulatePipePlaybackFailure --verbose --hierarchy --match selftest1 --config 8888 565 -r gm/tests/inputs/json/identical-pixels.json --writeJsonSummaryPath gm/tests/outputs/pipe-playback-failure/output-actual/json-summary.txt --writePath gm/tests/outputs/pipe-playback-failure/output-actual/writePath --mismatchPath gm/tests/outputs/pipe-playback-failure/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/pipe-playback-failure/output-actual/missingExpectationsPath diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/stdout b/gm/tests/outputs/pipe-playback-failure/output-expected/stdout index f2a253a022..818b0e84e8 100644 --- a/gm/tests/outputs/pipe-playback-failure/output-expected/stdout +++ b/gm/tests/outputs/pipe-playback-failure/output-expected/stdout @@ -6,9 +6,9 @@ GM: writing images without expectations to gm/tests/outputs/pipe-playback-failur GM: drawing... selftest1 [300 200] 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: ... and 5 modes ["pipe", "replay", "rtree", "serialize", "tilegrid"] +GM: ... so there should be a total of 7 tests. +GM: Ran 7 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=1 ExpectationsMismatch=0 MissingExpectations=0 WritingReferenceImage=0 GM: [*] 0 NoGpuContext: GM: [ ] 0 IntentionallySkipped: GM: [*] 1 RenderModeMismatch: comparison/selftest1-pipe diff --git a/gm/tests/run.sh b/gm/tests/run.sh index a7d13f1c9c..adc0d27ba9 100755 --- a/gm/tests/run.sh +++ b/gm/tests/run.sh @@ -222,7 +222,7 @@ gm_test "--verbose --hierarchy --match selftest1 $CONFIGS pdf -r $GM_INPUTS/json gm_test "--verbose --hierarchy --match selftest1 $CONFIGS" "$GM_OUTPUTS/no-readpath" # Test what happens if a subset of the renderModes fail (e.g. pipe) -gm_test "--pipe --simulatePipePlaybackFailure --verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/identical-pixels.json" "$GM_OUTPUTS/pipe-playback-failure" +gm_test "--simulatePipePlaybackFailure --verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/identical-pixels.json" "$GM_OUTPUTS/pipe-playback-failure" # Confirm that IntentionallySkipped tests are recorded as such. gm_test "--verbose --hierarchy --match selftest1 selftest2 $CONFIGS" "$GM_OUTPUTS/intentionally-skipped-tests"