gm self-test: stop checking stdout and stderr

BUG=skia:1568
NOTRY=True
R=bsalomon@google.com

Author: epoger@google.com

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

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

55 files changed, 3 insertions, 370 deletions

diff --git a/gm/tests/outputs/add-config-pdf/output-expected/command_line b/gm/tests/outputs/add-config-pdf/output-expected/command_line
deleted file mode 100644
index 611f0367d8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --verbose --hierarchy --match selftest1 --config 8888 565 pdf -r gm/tests/inputs/json/identical-bytes.json --writeJsonSummaryPath gm/tests/outputs/add-config-pdf/output-actual/json-summary.txt --writePath gm/tests/outputs/add-config-pdf/output-actual/writePath --mismatchPath gm/tests/outputs/add-config-pdf/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/add-config-pdf/output-actual/missingExpectationsPath
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/stderr b/gm/tests/outputs/add-config-pdf/output-expected/stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/stderr
+++ /dev/null
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/stdout b/gm/tests/outputs/add-config-pdf/output-expected/stdout
deleted file mode 100644
index 507fc7cec7..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/stdout
+++ /dev/null
@@ -1,21 +0,0 @@
-GM: These configs will be run: 8888 565 pdf
-GM: These PDF rasterizers will be run: poppler
-GM: reading expectations from JSON summary file gm/tests/inputs/json/identical-bytes.json
-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"]
-GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 3 tests.
-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:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/checksum-based-filenames/output-expected/command_line b/gm/tests/outputs/checksum-based-filenames/output-expected/command_line
deleted file mode 100644
index fbc8af7d1b..0000000000
--- a/gm/tests/outputs/checksum-based-filenames/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --verbose --writeChecksumBasedFilenames --match selftest1 --config 8888 565 -r gm/tests/inputs/json/different-pixels-no-hierarchy.json --writeJsonSummaryPath gm/tests/outputs/checksum-based-filenames/output-actual/json-summary.txt --writePath gm/tests/outputs/checksum-based-filenames/output-actual/writePath --mismatchPath gm/tests/outputs/checksum-based-filenames/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/checksum-based-filenames/output-actual/missingExpectationsPath
diff --git a/gm/tests/outputs/checksum-based-filenames/output-expected/stderr b/gm/tests/outputs/checksum-based-filenames/output-expected/stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gm/tests/outputs/checksum-based-filenames/output-expected/stderr
+++ /dev/null
diff --git a/gm/tests/outputs/checksum-based-filenames/output-expected/stdout b/gm/tests/outputs/checksum-based-filenames/output-expected/stdout
deleted file mode 100644
index 8432287a0e..0000000000
--- a/gm/tests/outputs/checksum-based-filenames/output-expected/stdout
+++ /dev/null
@@ -1,20 +0,0 @@
-GM: These configs will be run: 8888 565
-GM: reading expectations from JSON summary file gm/tests/inputs/json/different-pixels-no-hierarchy.json
-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"]
-GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 2 tests.
-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:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/command_line b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/command_line
deleted file mode 100644
index 90fb36caec..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --verbose --hierarchy --match selftest1 --config 8888 565 -r gm/tests/inputs/images/different-pixels --writeJsonSummaryPath gm/tests/outputs/compared-against-different-pixels-images/output-actual/json-summary.txt --writePath gm/tests/outputs/compared-against-different-pixels-images/output-actual/writePath --mismatchPath gm/tests/outputs/compared-against-different-pixels-images/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/compared-against-different-pixels-images/output-actual/missingExpectationsPath
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
deleted file mode 100644
index 293c4d0d49..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-GM: ---- 8888/selftest1.png: 60000 (of 60000) differing pixels, max per-channel mismatch R=0 G=111 B=103 A=0
-GM: ---- 565/selftest1.png: not computing max per-channel pixel mismatch because non-8888
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
deleted file mode 100644
index 32f73cc729..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/stdout
+++ /dev/null
@@ -1,20 +0,0 @@
-GM: These configs will be run: 8888 565
-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"]
-GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 2 tests.
-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:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/command_line b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/command_line
deleted file mode 100644
index 0175596882..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --verbose --hierarchy --match selftest1 --config 8888 565 -r gm/tests/inputs/json/different-pixels.json --writeJsonSummaryPath gm/tests/outputs/compared-against-different-pixels-json/output-actual/json-summary.txt --writePath gm/tests/outputs/compared-against-different-pixels-json/output-actual/writePath --mismatchPath gm/tests/outputs/compared-against-different-pixels-json/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/compared-against-different-pixels-json/output-actual/missingExpectationsPath
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
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stderr
+++ /dev/null
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
deleted file mode 100644
index d68c495615..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/stdout
+++ /dev/null
@@ -1,20 +0,0 @@
-GM: These configs will be run: 8888 565
-GM: reading expectations from JSON summary file gm/tests/inputs/json/different-pixels.json
-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"]
-GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 2 tests.
-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:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/command_line b/gm/tests/outputs/compared-against-empty-dir/output-expected/command_line
deleted file mode 100644
index cd0676a9c4..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --verbose --hierarchy --match selftest --ignoreFailuresFile gm/tests/inputs/ignored-tests.txt --config 8888 565 -r gm/tests/inputs/images/empty-dir --writeJsonSummaryPath gm/tests/outputs/compared-against-empty-dir/output-actual/json-summary.txt --writePath gm/tests/outputs/compared-against-empty-dir/output-actual/writePath --mismatchPath gm/tests/outputs/compared-against-empty-dir/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/compared-against-empty-dir/output-actual/missingExpectationsPath
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/stderr b/gm/tests/outputs/compared-against-empty-dir/output-expected/stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/stderr
+++ /dev/null
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout b/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout
deleted file mode 100644
index 5c7a5779a5..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout
+++ /dev/null
@@ -1,21 +0,0 @@
-GM: These configs will be run: 8888 565
-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... selftest2 [300 200]
-GM: drawing... selftest1 [300 200]
-GM: Ran 2 GMs
-GM: ... over  2 configs ["8888", "565"]
-GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 4 tests.
-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:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/command_line b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/command_line
deleted file mode 100644
index 0de4a7e341..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --verbose --hierarchy --match selftest1 --config 8888 565 -r gm/tests/inputs/images/identical-bytes --writeJsonSummaryPath gm/tests/outputs/compared-against-identical-bytes-images/output-actual/json-summary.txt --writePath gm/tests/outputs/compared-against-identical-bytes-images/output-actual/writePath --mismatchPath gm/tests/outputs/compared-against-identical-bytes-images/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/compared-against-identical-bytes-images/output-actual/missingExpectationsPath
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
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/stderr
+++ /dev/null
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
deleted file mode 100644
index bb1cc8a1a1..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/stdout
+++ /dev/null
@@ -1,20 +0,0 @@
-GM: These configs will be run: 8888 565
-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"]
-GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 2 tests.
-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:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/command_line b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/command_line
deleted file mode 100644
index f5da935e01..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --verbose --hierarchy --match selftest1 --config 8888 565 -r gm/tests/inputs/json/identical-bytes.json --writeJsonSummaryPath gm/tests/outputs/compared-against-identical-bytes-json/output-actual/json-summary.txt --writePath gm/tests/outputs/compared-against-identical-bytes-json/output-actual/writePath --mismatchPath gm/tests/outputs/compared-against-identical-bytes-json/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/compared-against-identical-bytes-json/output-actual/missingExpectationsPath
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
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/stderr
+++ /dev/null
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
deleted file mode 100644
index dc08b87ebe..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/stdout
+++ /dev/null
@@ -1,20 +0,0 @@
-GM: These configs will be run: 8888 565
-GM: reading expectations from JSON summary file gm/tests/inputs/json/identical-bytes.json
-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"]
-GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 2 tests.
-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:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/command_line b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/command_line
deleted file mode 100644
index 16b328f584..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --verbose --hierarchy --match selftest1 --config 8888 565 -r gm/tests/inputs/images/identical-pixels --writeJsonSummaryPath gm/tests/outputs/compared-against-identical-pixels-images/output-actual/json-summary.txt --writePath gm/tests/outputs/compared-against-identical-pixels-images/output-actual/writePath --mismatchPath gm/tests/outputs/compared-against-identical-pixels-images/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/compared-against-identical-pixels-images/output-actual/missingExpectationsPath
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
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/stderr
+++ /dev/null
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
deleted file mode 100644
index 0b31ff6e78..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/stdout
+++ /dev/null
@@ -1,20 +0,0 @@
-GM: These configs will be run: 8888 565
-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"]
-GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 2 tests.
-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:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/command_line b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/command_line
deleted file mode 100644
index 30faa0fd95..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --verbose --hierarchy --match selftest1 --config 8888 565 -r gm/tests/inputs/json/identical-pixels.json --writeJsonSummaryPath gm/tests/outputs/compared-against-identical-pixels-json/output-actual/json-summary.txt --writePath gm/tests/outputs/compared-against-identical-pixels-json/output-actual/writePath --mismatchPath gm/tests/outputs/compared-against-identical-pixels-json/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/compared-against-identical-pixels-json/output-actual/missingExpectationsPath
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
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/stderr
+++ /dev/null
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
deleted file mode 100644
index 969c24b632..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/stdout
+++ /dev/null
@@ -1,20 +0,0 @@
-GM: These configs will be run: 8888 565
-GM: reading expectations from JSON summary file gm/tests/inputs/json/identical-pixels.json
-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"]
-GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 2 tests.
-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:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/compared-against-nonexistent-dir/output-expected/command_line b/gm/tests/outputs/compared-against-nonexistent-dir/output-expected/command_line
deleted file mode 100644
index 5c6c403b77..0000000000
--- a/gm/tests/outputs/compared-against-nonexistent-dir/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --verbose --hierarchy --match selftest1 --config 8888 565 -r ../path/to/nowhere --writeJsonSummaryPath gm/tests/outputs/compared-against-nonexistent-dir/output-actual/json-summary.txt --writePath gm/tests/outputs/compared-against-nonexistent-dir/output-actual/writePath --mismatchPath gm/tests/outputs/compared-against-nonexistent-dir/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/compared-against-nonexistent-dir/output-actual/missingExpectationsPath
diff --git a/gm/tests/outputs/compared-against-nonexistent-dir/output-expected/stderr b/gm/tests/outputs/compared-against-nonexistent-dir/output-expected/stderr
deleted file mode 100644
index 23baadf931..0000000000
--- a/gm/tests/outputs/compared-against-nonexistent-dir/output-expected/stderr
+++ /dev/null
@@ -1 +0,0 @@
-GM: readPath ../path/to/nowhere does not exist!
diff --git a/gm/tests/outputs/compared-against-nonexistent-dir/output-expected/stdout b/gm/tests/outputs/compared-against-nonexistent-dir/output-expected/stdout
deleted file mode 100644
index 94b3f8ff31..0000000000
--- a/gm/tests/outputs/compared-against-nonexistent-dir/output-expected/stdout
+++ /dev/null
@@ -1 +0,0 @@
-GM: These configs will be run: 8888 565
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/command_line b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/command_line
deleted file mode 100644
index 48bb35f629..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-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 --writePath gm/tests/outputs/ignore-expectations-mismatch/output-actual/writePath --mismatchPath gm/tests/outputs/ignore-expectations-mismatch/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/ignore-expectations-mismatch/output-actual/missingExpectationsPath
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stderr b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stderr
+++ /dev/null
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout
deleted file mode 100644
index 09aff571c8..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/stdout
+++ /dev/null
@@ -1,20 +0,0 @@
-GM: These configs will be run: 8888 565
-GM: reading expectations from JSON summary file gm/tests/inputs/json/different-pixels.json
-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"]
-GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 2 tests.
-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:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/command_line b/gm/tests/outputs/ignoring-one-test/output-expected/command_line
deleted file mode 100644
index 6c9250df26..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --verbose --hierarchy --match selftest --ignoreFailuresFile gm/tests/inputs/ignored-tests.txt --config 8888 565 -r gm/tests/inputs/json/different-pixels.json --writeJsonSummaryPath gm/tests/outputs/ignoring-one-test/output-actual/json-summary.txt --writePath gm/tests/outputs/ignoring-one-test/output-actual/writePath --mismatchPath gm/tests/outputs/ignoring-one-test/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/ignoring-one-test/output-actual/missingExpectationsPath
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/stderr b/gm/tests/outputs/ignoring-one-test/output-expected/stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/stderr
+++ /dev/null
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/stdout b/gm/tests/outputs/ignoring-one-test/output-expected/stdout
deleted file mode 100644
index 328cb86e1e..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/stdout
+++ /dev/null
@@ -1,21 +0,0 @@
-GM: These configs will be run: 8888 565
-GM: reading expectations from JSON summary file gm/tests/inputs/json/different-pixels.json
-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... selftest2 [300 200]
-GM: drawing... selftest1 [300 200]
-GM: Ran 2 GMs
-GM: ... over  2 configs ["8888", "565"]
-GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 4 tests.
-GM: Ran 4 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=0 GeneratePdfFailed=0 ExpectationsMismatch=4 MissingExpectations=0 WritingReferenceImage=0
-GM: [*] 0 NoGpuContext:
-GM: [ ] 0 IntentionallySkipped:
-GM: [*] 0 RenderModeMismatch:
-GM: [*] 0 GeneratePdfFailed:
-GM: [*] 4 ExpectationsMismatch: 8888/selftest2 565/selftest2 8888/selftest1 565/selftest1
-GM: [ ] 0 MissingExpectations:
-GM: [*] 0 WritingReferenceImage:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/command_line b/gm/tests/outputs/ignoring-some-failures/output-expected/command_line
deleted file mode 100644
index 37be27526c..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --verbose --hierarchy --match selftest1 --config 8888 565 -r gm/tests/inputs/json/different-pixels-ignore-some-failures.json --writeJsonSummaryPath gm/tests/outputs/ignoring-some-failures/output-actual/json-summary.txt --writePath gm/tests/outputs/ignoring-some-failures/output-actual/writePath --mismatchPath gm/tests/outputs/ignoring-some-failures/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/ignoring-some-failures/output-actual/missingExpectationsPath
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/stderr b/gm/tests/outputs/ignoring-some-failures/output-expected/stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/stderr
+++ /dev/null
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/stdout b/gm/tests/outputs/ignoring-some-failures/output-expected/stdout
deleted file mode 100644
index ba05a575cd..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/stdout
+++ /dev/null
@@ -1,20 +0,0 @@
-GM: These configs will be run: 8888 565
-GM: reading expectations from JSON summary file gm/tests/inputs/json/different-pixels-ignore-some-failures.json
-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"]
-GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 2 tests.
-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:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/command_line b/gm/tests/outputs/intentionally-skipped-tests/output-expected/command_line
deleted file mode 100644
index 5061bb3bbc..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --verbose --hierarchy --match selftest1 selftest2 --config 8888 565 --writeJsonSummaryPath gm/tests/outputs/intentionally-skipped-tests/output-actual/json-summary.txt --writePath gm/tests/outputs/intentionally-skipped-tests/output-actual/writePath --mismatchPath gm/tests/outputs/intentionally-skipped-tests/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/intentionally-skipped-tests/output-actual/missingExpectationsPath
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/stderr b/gm/tests/outputs/intentionally-skipped-tests/output-expected/stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/stderr
+++ /dev/null
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/stdout b/gm/tests/outputs/intentionally-skipped-tests/output-expected/stdout
deleted file mode 100644
index b25d8feaeb..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/stdout
+++ /dev/null
@@ -1,20 +0,0 @@
-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
-GM: ... over  2 configs ["8888", "565"]
-GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 4 tests.
-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:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/no-hierarchy/output-expected/command_line b/gm/tests/outputs/no-hierarchy/output-expected/command_line
deleted file mode 100644
index 1b5f8aa705..0000000000
--- a/gm/tests/outputs/no-hierarchy/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --verbose --match selftest1 --config 8888 565 -r gm/tests/inputs/json/different-pixels-no-hierarchy.json --writeJsonSummaryPath gm/tests/outputs/no-hierarchy/output-actual/json-summary.txt --writePath gm/tests/outputs/no-hierarchy/output-actual/writePath --mismatchPath gm/tests/outputs/no-hierarchy/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/no-hierarchy/output-actual/missingExpectationsPath
diff --git a/gm/tests/outputs/no-hierarchy/output-expected/stderr b/gm/tests/outputs/no-hierarchy/output-expected/stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gm/tests/outputs/no-hierarchy/output-expected/stderr
+++ /dev/null
diff --git a/gm/tests/outputs/no-hierarchy/output-expected/stdout b/gm/tests/outputs/no-hierarchy/output-expected/stdout
deleted file mode 100644
index 2ae755a8b1..0000000000
--- a/gm/tests/outputs/no-hierarchy/output-expected/stdout
+++ /dev/null
@@ -1,20 +0,0 @@
-GM: These configs will be run: 8888 565
-GM: reading expectations from JSON summary file gm/tests/inputs/json/different-pixels-no-hierarchy.json
-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"]
-GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 2 tests.
-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:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/no-readpath/output-expected/command_line b/gm/tests/outputs/no-readpath/output-expected/command_line
deleted file mode 100644
index 96898019a6..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --verbose --hierarchy --match selftest1 --config 8888 565 --writeJsonSummaryPath gm/tests/outputs/no-readpath/output-actual/json-summary.txt --writePath gm/tests/outputs/no-readpath/output-actual/writePath --mismatchPath gm/tests/outputs/no-readpath/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/no-readpath/output-actual/missingExpectationsPath
diff --git a/gm/tests/outputs/no-readpath/output-expected/stderr b/gm/tests/outputs/no-readpath/output-expected/stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/stderr
+++ /dev/null
diff --git a/gm/tests/outputs/no-readpath/output-expected/stdout b/gm/tests/outputs/no-readpath/output-expected/stdout
deleted file mode 100644
index ec10ea9d1f..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/stdout
+++ /dev/null
@@ -1,19 +0,0 @@
-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"]
-GM: ...  and  1 modes   [""]
-GM: ... so there should be a total of 2 tests.
-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:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/nonverbose/output-expected/command_line b/gm/tests/outputs/nonverbose/output-expected/command_line
deleted file mode 100644
index c9964ec952..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-out/Debug/gm --hierarchy --match selftest1 --config 8888 565 -r gm/tests/inputs/images/empty-dir --writeJsonSummaryPath gm/tests/outputs/nonverbose/output-actual/json-summary.txt --writePath gm/tests/outputs/nonverbose/output-actual/writePath --mismatchPath gm/tests/outputs/nonverbose/output-actual/mismatchPath --missingExpectationsPath gm/tests/outputs/nonverbose/output-actual/missingExpectationsPath
diff --git a/gm/tests/outputs/nonverbose/output-expected/stderr b/gm/tests/outputs/nonverbose/output-expected/stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/stderr
+++ /dev/null
diff --git a/gm/tests/outputs/nonverbose/output-expected/stdout b/gm/tests/outputs/nonverbose/output-expected/stdout
deleted file mode 100644
index 8d35d20244..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/stdout
+++ /dev/null
@@ -1,11 +0,0 @@
-GM: These configs will be run: 8888 565
-GM: drawing... selftest1 [300 200]
-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:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/command_line b/gm/tests/outputs/pipe-playback-failure/output-expected/command_line
deleted file mode 100644
index b9aade2d87..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/command_line
+++ /dev/null
@@ -1 +0,0 @@
-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
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/stderr b/gm/tests/outputs/pipe-playback-failure/output-expected/stderr
deleted file mode 100644
index b40a74802d..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-GM: ---- 8888/selftest1-pipe.png: 60000 (of 60000) differing pixels, max per-channel mismatch R=135 G=246 B=135 A=0
-GM: ---- 565/selftest1-pipe.png: not computing max per-channel pixel mismatch because non-8888
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/stdout b/gm/tests/outputs/pipe-playback-failure/output-expected/stdout
deleted file mode 100644
index dbb4dd8ad9..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/stdout
+++ /dev/null
@@ -1,20 +0,0 @@
-GM: These configs will be run: 8888 565
-GM: reading expectations from JSON summary file gm/tests/inputs/json/identical-pixels.json
-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"]
-GM: ...  and  2 modes   ["", "pipe"]
-GM: ... so there should be a total of 4 tests.
-GM: Ran 4 tests: NoGpuContext=0 IntentionallySkipped=0 RenderModeMismatch=2 GeneratePdfFailed=0 ExpectationsMismatch=0 MissingExpectations=0 WritingReferenceImage=0
-GM: [*] 0 NoGpuContext:
-GM: [ ] 0 IntentionallySkipped:
-GM: [*] 2 RenderModeMismatch: 8888/selftest1-pipe 565/selftest1-pipe
-GM: [*] 0 GeneratePdfFailed:
-GM: [*] 0 ExpectationsMismatch:
-GM: [ ] 0 MissingExpectations:
-GM: [*] 0 WritingReferenceImage:
-GM: (results marked with [*] will cause nonzero return value)
diff --git a/gm/tests/run.sh b/gm/tests/run.sh
index 29074e5f1d..333f3effc0 100755
--- a/gm/tests/run.sh
+++ b/gm/tests/run.sh
@@ -70,7 +70,6 @@ function assert_fails {
 
 # Run gm...
 # - with the arguments in $1
-# - writing stdout into $2/$OUTPUT_ACTUAL_SUBDIR/stdout
 # - writing json summary into $2/$OUTPUT_ACTUAL_SUBDIR/json-summary.txt
 # - writing return value into $2/$OUTPUT_ACTUAL_SUBDIR/return_value
 # Then compare all of those against $2/$OUTPUT_EXPECTED_SUBDIR .
@@ -89,20 +88,9 @@ function gm_test {
 
   COMMAND="$GM_BINARY $GM_ARGS --writeJsonSummaryPath $JSON_SUMMARY_FILE --writePath $ACTUAL_OUTPUT_DIR/writePath --mismatchPath $ACTUAL_OUTPUT_DIR/mismatchPath --missingExpectationsPath $ACTUAL_OUTPUT_DIR/missingExpectationsPath"
 
-  echo "$COMMAND" >$ACTUAL_OUTPUT_DIR/command_line
-  $COMMAND >$ACTUAL_OUTPUT_DIR/stdout 2>$ACTUAL_OUTPUT_DIR/stderr
+  $COMMAND
   echo $? >$ACTUAL_OUTPUT_DIR/return_value
 
-  # Only compare selected lines in the stdout, to ignore any spurious lines
-  # as noted in http://code.google.com/p/skia/issues/detail?id=1068 .
-  #
-  # TODO(epoger): This is still hacky... we need to rewrite this script in
-  # Python soon, and make stuff like this more maintainable.
-  grep ^GM: $ACTUAL_OUTPUT_DIR/stdout >$ACTUAL_OUTPUT_DIR/stdout-tmp
-  mv $ACTUAL_OUTPUT_DIR/stdout-tmp $ACTUAL_OUTPUT_DIR/stdout
-  grep ^GM: $ACTUAL_OUTPUT_DIR/stderr >$ACTUAL_OUTPUT_DIR/stderr-tmp
-  mv $ACTUAL_OUTPUT_DIR/stderr-tmp $ACTUAL_OUTPUT_DIR/stderr
-
   # Replace image file contents with just the filename, for two reasons:
   # 1. Image file encoding may vary by platform
   # 2. https://code.google.com/p/chromium/issues/detail?id=169600
@@ -279,9 +267,11 @@ done
 # Exercise all rebaseline_server unittests.
 assert_passes "python gm/rebaseline_server/test_all.py"
 
+echo
 if [ $ENCOUNTERED_ANY_ERRORS == 0 ]; then
   echo "All tests passed."
   exit 0
 else
+  echo "Some tests failed."
   exit 1
 fi