rebaseline gm self-tests after https://code.google.com/p/skia/source/detail?r=12850

The GM self-test's fragility is already noted in https://code.google.com/p/skia/issues/detail?id=1068 ('make gm self-test more robust')

NOTRY=True
NOTREECHECKS=True
R=mtklein@google.com
TBR=mtklein

Author: epoger@google.com

Review URL: https://codereview.chromium.org/112203006

git-svn-id: http://skia.googlecode.com/svn/trunk@12885 2bbb7eff-a529-9590-31e7-b0007b416f81

16 files changed, 16 insertions, 0 deletions

diff --git a/gm/tests/outputs/add-config-pdf/output-expected/stdout b/gm/tests/outputs/add-config-pdf/output-expected/stdout
index fef69b1040..cbdb12a1a0 100644
--- a/gm/tests/outputs/add-config-pdf/output-expected/stdout
+++ b/gm/tests/outputs/add-config-pdf/output-expected/stdout
@@ -4,6 +4,7 @@ GM: reading expectations from JSON summary file gm/tests/inputs/json/identical-b
 GM: writing to gm/tests/outputs/add-config-pdf/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/add-config-pdf/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/add-config-pdf/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest1 [300 200]
 GM: Ran 1 GMs
 GM: ... over  3 configs ["8888", "565", "pdf"]
diff --git a/gm/tests/outputs/checksum-based-filenames/output-expected/stdout b/gm/tests/outputs/checksum-based-filenames/output-expected/stdout
index de226fa02e..6e33214898 100644
--- a/gm/tests/outputs/checksum-based-filenames/output-expected/stdout
+++ b/gm/tests/outputs/checksum-based-filenames/output-expected/stdout
@@ -3,6 +3,7 @@ GM: reading expectations from JSON summary file gm/tests/inputs/json/different-p
 GM: writing to gm/tests/outputs/checksum-based-filenames/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/checksum-based-filenames/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/checksum-based-filenames/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest1 [300 200]
 GM: Ran 1 GMs
 GM: ... over  2 configs ["8888", "565"]
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 ab704660dc..eb634e525e 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
@@ -3,6 +3,7 @@ GM: reading from gm/tests/inputs/images/different-pixels
 GM: writing to gm/tests/outputs/compared-against-different-pixels-images/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/compared-against-different-pixels-images/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/compared-against-different-pixels-images/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest1 [300 200]
 GM: Ran 1 GMs
 GM: ... over  2 configs ["8888", "565"]
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 886d2f33c4..0701282514 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
@@ -3,6 +3,7 @@ GM: reading expectations from JSON summary file gm/tests/inputs/json/different-p
 GM: writing to gm/tests/outputs/compared-against-different-pixels-json/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/compared-against-different-pixels-json/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/compared-against-different-pixels-json/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest1 [300 200]
 GM: Ran 1 GMs
 GM: ... over  2 configs ["8888", "565"]
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 f64e83735f..9cbcf265c4 100644
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout
+++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout
@@ -3,6 +3,7 @@ GM: reading from gm/tests/inputs/images/empty-dir
 GM: writing to gm/tests/outputs/compared-against-empty-dir/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/compared-against-empty-dir/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/compared-against-empty-dir/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest1 [300 200]
 GM: Ran 1 GMs
 GM: ... over  2 configs ["8888", "565"]
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 c34de49b5d..23aa058ad0 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
@@ -3,6 +3,7 @@ GM: reading from gm/tests/inputs/images/identical-bytes
 GM: writing to gm/tests/outputs/compared-against-identical-bytes-images/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/compared-against-identical-bytes-images/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/compared-against-identical-bytes-images/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest1 [300 200]
 GM: Ran 1 GMs
 GM: ... over  2 configs ["8888", "565"]
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 b048163b0e..82de4b72e6 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
@@ -3,6 +3,7 @@ GM: reading expectations from JSON summary file gm/tests/inputs/json/identical-b
 GM: writing to gm/tests/outputs/compared-against-identical-bytes-json/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/compared-against-identical-bytes-json/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/compared-against-identical-bytes-json/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest1 [300 200]
 GM: Ran 1 GMs
 GM: ... over  2 configs ["8888", "565"]
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 1fdc76e0c2..e2b02fedf1 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
@@ -3,6 +3,7 @@ GM: reading from gm/tests/inputs/images/identical-pixels
 GM: writing to gm/tests/outputs/compared-against-identical-pixels-images/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/compared-against-identical-pixels-images/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/compared-against-identical-pixels-images/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest1 [300 200]
 GM: Ran 1 GMs
 GM: ... over  2 configs ["8888", "565"]
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 97edbfabb0..7f474041df 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
@@ -3,6 +3,7 @@ GM: reading expectations from JSON summary file gm/tests/inputs/json/identical-p
 GM: writing to gm/tests/outputs/compared-against-identical-pixels-json/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/compared-against-identical-pixels-json/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/compared-against-identical-pixels-json/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest1 [300 200]
 GM: Ran 1 GMs
 GM: ... over  2 configs ["8888", "565"]
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout
index 9cb4de613f..a7ce529bfb 100644
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout
+++ b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout
@@ -3,6 +3,7 @@ GM: reading expectations from JSON summary file gm/tests/inputs/json/different-p
 GM: writing to gm/tests/outputs/ignore-expectations-mismatch/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/ignore-expectations-mismatch/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/ignore-expectations-mismatch/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest1 [300 200]
 GM: Ran 1 GMs
 GM: ... over  2 configs ["8888", "565"]
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/stdout b/gm/tests/outputs/ignoring-one-test/output-expected/stdout
index fbad896ed3..07adb39933 100644
--- a/gm/tests/outputs/ignoring-one-test/output-expected/stdout
+++ b/gm/tests/outputs/ignoring-one-test/output-expected/stdout
@@ -3,6 +3,7 @@ GM: reading expectations from JSON summary file gm/tests/inputs/json/different-p
 GM: writing to gm/tests/outputs/ignoring-one-test/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/ignoring-one-test/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/ignoring-one-test/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest1 [300 200]
 GM: Ran 1 GMs
 GM: ... over  2 configs ["8888", "565"]
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/stdout b/gm/tests/outputs/ignoring-some-failures/output-expected/stdout
index e0b5eb47bc..29506202b2 100644
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/stdout
+++ b/gm/tests/outputs/ignoring-some-failures/output-expected/stdout
@@ -3,6 +3,7 @@ GM: reading expectations from JSON summary file gm/tests/inputs/json/different-p
 GM: writing to gm/tests/outputs/ignoring-some-failures/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/ignoring-some-failures/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/ignoring-some-failures/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest1 [300 200]
 GM: Ran 1 GMs
 GM: ... over  2 configs ["8888", "565"]
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/stdout b/gm/tests/outputs/intentionally-skipped-tests/output-expected/stdout
index debb48855c..963c652934 100644
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/stdout
+++ b/gm/tests/outputs/intentionally-skipped-tests/output-expected/stdout
@@ -2,6 +2,7 @@ GM: These configs will be run: 8888 565
 GM: writing to gm/tests/outputs/intentionally-skipped-tests/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/intentionally-skipped-tests/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/intentionally-skipped-tests/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest2 [300 200]
 GM: drawing... selftest1 [300 200]
 GM: Ran 2 GMs
diff --git a/gm/tests/outputs/no-hierarchy/output-expected/stdout b/gm/tests/outputs/no-hierarchy/output-expected/stdout
index 65d26adcd4..7248d26978 100644
--- a/gm/tests/outputs/no-hierarchy/output-expected/stdout
+++ b/gm/tests/outputs/no-hierarchy/output-expected/stdout
@@ -3,6 +3,7 @@ GM: reading expectations from JSON summary file gm/tests/inputs/json/different-p
 GM: writing to gm/tests/outputs/no-hierarchy/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/no-hierarchy/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/no-hierarchy/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest1 [300 200]
 GM: Ran 1 GMs
 GM: ... over  2 configs ["8888", "565"]
diff --git a/gm/tests/outputs/no-readpath/output-expected/stdout b/gm/tests/outputs/no-readpath/output-expected/stdout
index bab30e6ae2..ffa60c053a 100644
--- a/gm/tests/outputs/no-readpath/output-expected/stdout
+++ b/gm/tests/outputs/no-readpath/output-expected/stdout
@@ -2,6 +2,7 @@ GM: These configs will be run: 8888 565
 GM: writing to gm/tests/outputs/no-readpath/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/no-readpath/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/no-readpath/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest1 [300 200]
 GM: Ran 1 GMs
 GM: ... over  2 configs ["8888", "565"]
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/stdout b/gm/tests/outputs/pipe-playback-failure/output-expected/stdout
index b5c45830af..fffe55ee67 100644
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/stdout
+++ b/gm/tests/outputs/pipe-playback-failure/output-expected/stdout
@@ -3,6 +3,7 @@ GM: reading expectations from JSON summary file gm/tests/inputs/json/identical-p
 GM: writing to gm/tests/outputs/pipe-playback-failure/output-actual/writePath
 GM: writing mismatches to gm/tests/outputs/pipe-playback-failure/output-actual/mismatchPath
 GM: writing images without expectations to gm/tests/outputs/pipe-playback-failure/output-actual/missingExpectationsPath
+GM: reading resources from resources
 GM: drawing... selftest1 [300 200]
 GM: Ran 1 GMs
 GM: ... over  2 configs ["8888", "565"]