aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/tests
diff options
context:
space:
mode:
Diffstat (limited to 'gm/tests')
-rw-r--r--gm/tests/.gitignore1
-rw-r--r--gm/tests/outputs/.gitignore1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/json-summary.txt31
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/pdf-poppler/bogusfile1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/pdf/bogusfile1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf-poppler/bogusfile1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf-poppler/selftest1.png1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf/bogusfile1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/return_value1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/writePath/565/bogusfile1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/writePath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/writePath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/writePath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf-poppler/bogusfile1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf-poppler/selftest1.png1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf/bogusfile1
-rw-r--r--gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf/selftest1.pdf1
-rw-r--r--gm/tests/outputs/checksum-based-filenames/output-expected/json-summary.txt25
-rw-r--r--gm/tests/outputs/checksum-based-filenames/output-expected/mismatchPath/bitmap-64bitMD5_selftest1_1209453360120438698.png1
-rw-r--r--gm/tests/outputs/checksum-based-filenames/output-expected/mismatchPath/bitmap-64bitMD5_selftest1_12927999507540085554.png1
-rw-r--r--gm/tests/outputs/checksum-based-filenames/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/checksum-based-filenames/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/checksum-based-filenames/output-expected/return_value1
-rw-r--r--gm/tests/outputs/checksum-based-filenames/output-expected/writePath/bitmap-64bitMD5_selftest1_1209453360120438698.png1
-rw-r--r--gm/tests/outputs/checksum-based-filenames/output-expected/writePath/bitmap-64bitMD5_selftest1_12927999507540085554.png1
-rw-r--r--gm/tests/outputs/checksum-based-filenames/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt25
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-images/output-expected/missingExpectationsPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-images/output-expected/missingExpectationsPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-images/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-images/output-expected/return_value1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt25
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-json/output-expected/missingExpectationsPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-json/output-expected/missingExpectationsPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-json/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-json/output-expected/return_value1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt31
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/mismatchPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/mismatchPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/565/selftest2.png1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/8888/selftest2.png1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/return_value1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/565/selftest2.png1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/8888/selftest2.png1
-rw-r--r--gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt25
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-images/output-expected/mismatchPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-images/output-expected/mismatchPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-images/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-images/output-expected/missingExpectationsPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-images/output-expected/missingExpectationsPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-images/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-images/output-expected/return_value1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt25
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-json/output-expected/mismatchPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-json/output-expected/mismatchPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-json/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-json/output-expected/missingExpectationsPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-json/output-expected/missingExpectationsPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-json/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-json/output-expected/return_value1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt25
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-images/output-expected/mismatchPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-images/output-expected/mismatchPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-images/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-images/output-expected/missingExpectationsPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-images/output-expected/missingExpectationsPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-images/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-images/output-expected/return_value1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt25
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-json/output-expected/mismatchPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-json/output-expected/mismatchPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-json/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-json/output-expected/missingExpectationsPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-json/output-expected/missingExpectationsPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-json/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-json/output-expected/return_value1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/565/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/compared-against-nonexistent-dir/output-expected/return_value1
-rw-r--r--gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt25
-rw-r--r--gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/ignore-expectations-mismatch/output-expected/missingExpectationsPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/ignore-expectations-mismatch/output-expected/missingExpectationsPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/ignore-expectations-mismatch/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/ignore-expectations-mismatch/output-expected/return_value1
-rw-r--r--gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/565/bogusfile1
-rw-r--r--gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/json-summary.txt40
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/565/selftest2.png1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/8888/selftest2.png1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/missingExpectationsPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/missingExpectationsPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/return_value1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/writePath/565/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/writePath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/writePath/565/selftest2.png1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/writePath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/writePath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/writePath/8888/selftest2.png1
-rw-r--r--gm/tests/outputs/ignoring-one-test/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-some-failures/output-expected/json-summary.txt26
-rw-r--r--gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-some-failures/output-expected/missingExpectationsPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-some-failures/output-expected/missingExpectationsPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-some-failures/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-some-failures/output-expected/return_value1
-rw-r--r--gm/tests/outputs/ignoring-some-failures/output-expected/writePath/565/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-some-failures/output-expected/writePath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/ignoring-some-failures/output-expected/writePath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/ignoring-some-failures/output-expected/writePath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/ignoring-some-failures/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt14
-rw-r--r--gm/tests/outputs/intentionally-skipped-tests/output-expected/mismatchPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/intentionally-skipped-tests/output-expected/mismatchPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/intentionally-skipped-tests/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/intentionally-skipped-tests/output-expected/missingExpectationsPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/intentionally-skipped-tests/output-expected/missingExpectationsPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/intentionally-skipped-tests/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/intentionally-skipped-tests/output-expected/return_value1
-rw-r--r--gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/565/bogusfile1
-rw-r--r--gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/565/selftest2.png1
-rw-r--r--gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/8888/selftest2.png1
-rw-r--r--gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/no-hierarchy/output-expected/json-summary.txt25
-rw-r--r--gm/tests/outputs/no-hierarchy/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/no-hierarchy/output-expected/mismatchPath/selftest1_565.png1
-rw-r--r--gm/tests/outputs/no-hierarchy/output-expected/mismatchPath/selftest1_8888.png1
-rw-r--r--gm/tests/outputs/no-hierarchy/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/no-hierarchy/output-expected/return_value1
-rw-r--r--gm/tests/outputs/no-hierarchy/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/no-hierarchy/output-expected/writePath/selftest1_565.png1
-rw-r--r--gm/tests/outputs/no-hierarchy/output-expected/writePath/selftest1_8888.png1
-rw-r--r--gm/tests/outputs/no-readpath/output-expected/json-summary.txt12
-rw-r--r--gm/tests/outputs/no-readpath/output-expected/mismatchPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/no-readpath/output-expected/mismatchPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/no-readpath/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/no-readpath/output-expected/missingExpectationsPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/no-readpath/output-expected/missingExpectationsPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/no-readpath/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/no-readpath/output-expected/return_value1
-rw-r--r--gm/tests/outputs/no-readpath/output-expected/writePath/565/bogusfile1
-rw-r--r--gm/tests/outputs/no-readpath/output-expected/writePath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/no-readpath/output-expected/writePath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/no-readpath/output-expected/writePath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/no-readpath/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/nonverbose/output-expected/json-summary.txt21
-rw-r--r--gm/tests/outputs/nonverbose/output-expected/mismatchPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/nonverbose/output-expected/mismatchPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/nonverbose/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/nonverbose/output-expected/return_value1
-rw-r--r--gm/tests/outputs/nonverbose/output-expected/writePath/565/bogusfile1
-rw-r--r--gm/tests/outputs/nonverbose/output-expected/writePath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/nonverbose/output-expected/writePath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/nonverbose/output-expected/writePath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/nonverbose/output-expected/writePath/bogusfile1
-rw-r--r--gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt40
-rw-r--r--gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/565/selftest1-pipe.png1
-rw-r--r--gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/8888/selftest1-pipe.png1
-rw-r--r--gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/bogusfile1
-rw-r--r--gm/tests/outputs/pipe-playback-failure/output-expected/missingExpectationsPath/565/bogusfile1
-rw-r--r--gm/tests/outputs/pipe-playback-failure/output-expected/missingExpectationsPath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/pipe-playback-failure/output-expected/missingExpectationsPath/bogusfile1
-rw-r--r--gm/tests/outputs/pipe-playback-failure/output-expected/return_value1
-rw-r--r--gm/tests/outputs/pipe-playback-failure/output-expected/writePath/565/bogusfile1
-rw-r--r--gm/tests/outputs/pipe-playback-failure/output-expected/writePath/565/selftest1.png1
-rw-r--r--gm/tests/outputs/pipe-playback-failure/output-expected/writePath/8888/bogusfile1
-rw-r--r--gm/tests/outputs/pipe-playback-failure/output-expected/writePath/8888/selftest1.png1
-rw-r--r--gm/tests/outputs/pipe-playback-failure/output-expected/writePath/bogusfile1
-rwxr-xr-xgm/tests/rebaseline.sh71
-rwxr-xr-xgm/tests/run.sh277
253 files changed, 0 insertions, 1022 deletions
diff --git a/gm/tests/.gitignore b/gm/tests/.gitignore
deleted file mode 100644
index 6b9a1e9dda..0000000000
--- a/gm/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-inputs/
diff --git a/gm/tests/outputs/.gitignore b/gm/tests/outputs/.gitignore
deleted file mode 100644
index f532248c04..0000000000
--- a/gm/tests/outputs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*/output-actual/
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/json-summary.txt b/gm/tests/outputs/add-config-pdf/output-expected/json-summary.txt
deleted file mode 100644
index a341d6a459..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/json-summary.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "actual-results" : {
- "failed" : null,
- "failure-ignored" : null,
- "no-comparison" : {
- "pdf-poppler/selftest1.png" : [ "bitmap-64bitMD5", 1149339852105949057 ]
- },
- "succeeded" : {
- "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
- }
- },
- "expected-results" : {
- "565/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 12927999507540085554 ]
- ],
- "ignore-failure" : false
- },
- "8888/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 1209453360120438698 ]
- ],
- "ignore-failure" : false
- },
- "pdf-poppler/selftest1.png" : {
- "allowed-digests" : null,
- "ignore-failure" : false
- }
- }
-}
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/565/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/8888/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/pdf-poppler/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/pdf-poppler/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/pdf-poppler/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/pdf/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/pdf/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/pdf/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/565/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/8888/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf-poppler/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf-poppler/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf-poppler/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf-poppler/selftest1.png b/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf-poppler/selftest1.png
deleted file mode 100644
index b644e4ded7..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf-poppler/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/add-config-pdf/output-actual/missingExpectationsPath/pdf-poppler/selftest1.png]
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/return_value b/gm/tests/outputs/add-config-pdf/output-expected/return_value
deleted file mode 100644
index 573541ac97..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/writePath/565/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/writePath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/writePath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/writePath/565/selftest1.png b/gm/tests/outputs/add-config-pdf/output-expected/writePath/565/selftest1.png
deleted file mode 100644
index 57ced63a8b..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/writePath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/add-config-pdf/output-actual/writePath/565/selftest1.png]
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/writePath/8888/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/writePath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/writePath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/writePath/8888/selftest1.png b/gm/tests/outputs/add-config-pdf/output-expected/writePath/8888/selftest1.png
deleted file mode 100644
index da67a30059..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/writePath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/add-config-pdf/output-actual/writePath/8888/selftest1.png]
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/writePath/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf-poppler/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf-poppler/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf-poppler/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf-poppler/selftest1.png b/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf-poppler/selftest1.png
deleted file mode 100644
index 052f1a98fb..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf-poppler/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/add-config-pdf/output-actual/writePath/pdf-poppler/selftest1.png]
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf/selftest1.pdf b/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf/selftest1.pdf
deleted file mode 100644
index acca03ba40..0000000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf/selftest1.pdf
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/add-config-pdf/output-actual/writePath/pdf/selftest1.pdf]
diff --git a/gm/tests/outputs/checksum-based-filenames/output-expected/json-summary.txt b/gm/tests/outputs/checksum-based-filenames/output-expected/json-summary.txt
deleted file mode 100644
index b3e2a8150f..0000000000
--- a/gm/tests/outputs/checksum-based-filenames/output-expected/json-summary.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "actual-results" : {
- "failed" : {
- "selftest1_565.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "selftest1_8888.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
- },
- "failure-ignored" : null,
- "no-comparison" : null,
- "succeeded" : null
- },
- "expected-results" : {
- "selftest1_565.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 8863920166200910451 ]
- ],
- "ignore-failure" : false
- },
- "selftest1_8888.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 13451349865803053525 ]
- ],
- "ignore-failure" : false
- }
- }
-}
diff --git a/gm/tests/outputs/checksum-based-filenames/output-expected/mismatchPath/bitmap-64bitMD5_selftest1_1209453360120438698.png b/gm/tests/outputs/checksum-based-filenames/output-expected/mismatchPath/bitmap-64bitMD5_selftest1_1209453360120438698.png
deleted file mode 100644
index bd5820f02e..0000000000
--- a/gm/tests/outputs/checksum-based-filenames/output-expected/mismatchPath/bitmap-64bitMD5_selftest1_1209453360120438698.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/checksum-based-filenames/output-actual/mismatchPath/bitmap-64bitMD5_selftest1_1209453360120438698.png]
diff --git a/gm/tests/outputs/checksum-based-filenames/output-expected/mismatchPath/bitmap-64bitMD5_selftest1_12927999507540085554.png b/gm/tests/outputs/checksum-based-filenames/output-expected/mismatchPath/bitmap-64bitMD5_selftest1_12927999507540085554.png
deleted file mode 100644
index b1ab39e5bc..0000000000
--- a/gm/tests/outputs/checksum-based-filenames/output-expected/mismatchPath/bitmap-64bitMD5_selftest1_12927999507540085554.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/checksum-based-filenames/output-actual/mismatchPath/bitmap-64bitMD5_selftest1_12927999507540085554.png]
diff --git a/gm/tests/outputs/checksum-based-filenames/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/checksum-based-filenames/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/checksum-based-filenames/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/checksum-based-filenames/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/checksum-based-filenames/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/checksum-based-filenames/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/checksum-based-filenames/output-expected/return_value b/gm/tests/outputs/checksum-based-filenames/output-expected/return_value
deleted file mode 100644
index ace9d03621..0000000000
--- a/gm/tests/outputs/checksum-based-filenames/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-255
diff --git a/gm/tests/outputs/checksum-based-filenames/output-expected/writePath/bitmap-64bitMD5_selftest1_1209453360120438698.png b/gm/tests/outputs/checksum-based-filenames/output-expected/writePath/bitmap-64bitMD5_selftest1_1209453360120438698.png
deleted file mode 100644
index e13581c69f..0000000000
--- a/gm/tests/outputs/checksum-based-filenames/output-expected/writePath/bitmap-64bitMD5_selftest1_1209453360120438698.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/checksum-based-filenames/output-actual/writePath/bitmap-64bitMD5_selftest1_1209453360120438698.png]
diff --git a/gm/tests/outputs/checksum-based-filenames/output-expected/writePath/bitmap-64bitMD5_selftest1_12927999507540085554.png b/gm/tests/outputs/checksum-based-filenames/output-expected/writePath/bitmap-64bitMD5_selftest1_12927999507540085554.png
deleted file mode 100644
index 0a719f7670..0000000000
--- a/gm/tests/outputs/checksum-based-filenames/output-expected/writePath/bitmap-64bitMD5_selftest1_12927999507540085554.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/checksum-based-filenames/output-actual/writePath/bitmap-64bitMD5_selftest1_12927999507540085554.png]
diff --git a/gm/tests/outputs/checksum-based-filenames/output-expected/writePath/bogusfile b/gm/tests/outputs/checksum-based-filenames/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/checksum-based-filenames/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt
deleted file mode 100644
index 7832eb0234..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "actual-results" : {
- "failed" : {
- "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
- },
- "failure-ignored" : null,
- "no-comparison" : null,
- "succeeded" : null
- },
- "expected-results" : {
- "565/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 8863920166200910451 ]
- ],
- "ignore-failure" : false
- },
- "8888/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 13451349865803053525 ]
- ],
- "ignore-failure" : false
- }
- }
-}
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/565/bogusfile b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/565/selftest1.png b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/565/selftest1.png
deleted file mode 100644
index 4d6827c728..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-different-pixels-images/output-actual/mismatchPath/565/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/8888/bogusfile b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/8888/selftest1.png b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/8888/selftest1.png
deleted file mode 100644
index 6784b25dfc..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-different-pixels-images/output-actual/mismatchPath/8888/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/missingExpectationsPath/565/bogusfile b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/missingExpectationsPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/missingExpectationsPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/missingExpectationsPath/8888/bogusfile b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/missingExpectationsPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/missingExpectationsPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/return_value b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/return_value
deleted file mode 100644
index ace9d03621..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-255
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/565/bogusfile b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/565/selftest1.png b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/565/selftest1.png
deleted file mode 100644
index b3464d03ce..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-different-pixels-images/output-actual/writePath/565/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/8888/bogusfile b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/8888/selftest1.png b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/8888/selftest1.png
deleted file mode 100644
index db19da55c5..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-different-pixels-images/output-actual/writePath/8888/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/bogusfile b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt
deleted file mode 100644
index 7832eb0234..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "actual-results" : {
- "failed" : {
- "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
- },
- "failure-ignored" : null,
- "no-comparison" : null,
- "succeeded" : null
- },
- "expected-results" : {
- "565/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 8863920166200910451 ]
- ],
- "ignore-failure" : false
- },
- "8888/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 13451349865803053525 ]
- ],
- "ignore-failure" : false
- }
- }
-}
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/565/bogusfile b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/565/selftest1.png b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/565/selftest1.png
deleted file mode 100644
index f89763b33f..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-different-pixels-json/output-actual/mismatchPath/565/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/8888/bogusfile b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/8888/selftest1.png b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/8888/selftest1.png
deleted file mode 100644
index e80f342a65..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-different-pixels-json/output-actual/mismatchPath/8888/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/missingExpectationsPath/565/bogusfile b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/missingExpectationsPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/missingExpectationsPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/missingExpectationsPath/8888/bogusfile b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/missingExpectationsPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/missingExpectationsPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/return_value b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/return_value
deleted file mode 100644
index ace9d03621..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-255
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/565/bogusfile b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/565/selftest1.png b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/565/selftest1.png
deleted file mode 100644
index cde22a6caa..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-different-pixels-json/output-actual/writePath/565/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/8888/bogusfile b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/8888/selftest1.png b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/8888/selftest1.png
deleted file mode 100644
index a9e26cf922..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-different-pixels-json/output-actual/writePath/8888/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/bogusfile b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt
deleted file mode 100644
index 69d2050981..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "actual-results" : {
- "failed" : null,
- "failure-ignored" : null,
- "no-comparison" : {
- "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "565/selftest2.png" : [ "bitmap-64bitMD5", 8863920166200910451 ],
- "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ],
- "8888/selftest2.png" : [ "bitmap-64bitMD5", 13451349865803053525 ]
- },
- "succeeded" : null
- },
- "expected-results" : {
- "565/selftest1.png" : {
- "allowed-digests" : null,
- "ignore-failure" : true
- },
- "565/selftest2.png" : {
- "allowed-digests" : null,
- "ignore-failure" : false
- },
- "8888/selftest1.png" : {
- "allowed-digests" : null,
- "ignore-failure" : true
- },
- "8888/selftest2.png" : {
- "allowed-digests" : null,
- "ignore-failure" : false
- }
- }
-}
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/mismatchPath/565/bogusfile b/gm/tests/outputs/compared-against-empty-dir/output-expected/mismatchPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/mismatchPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/mismatchPath/8888/bogusfile b/gm/tests/outputs/compared-against-empty-dir/output-expected/mismatchPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/mismatchPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/compared-against-empty-dir/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/565/bogusfile b/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/565/selftest1.png b/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/565/selftest1.png
deleted file mode 100644
index 57f48edbcd..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-empty-dir/output-actual/missingExpectationsPath/565/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/565/selftest2.png b/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/565/selftest2.png
deleted file mode 100644
index 0e1a13bb6a..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/565/selftest2.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-empty-dir/output-actual/missingExpectationsPath/565/selftest2.png]
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/8888/bogusfile b/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/8888/selftest1.png b/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/8888/selftest1.png
deleted file mode 100644
index 9abe3e8913..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-empty-dir/output-actual/missingExpectationsPath/8888/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/8888/selftest2.png b/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/8888/selftest2.png
deleted file mode 100644
index 3f0282d3e6..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/8888/selftest2.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-empty-dir/output-actual/missingExpectationsPath/8888/selftest2.png]
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/return_value b/gm/tests/outputs/compared-against-empty-dir/output-expected/return_value
deleted file mode 100644
index 573541ac97..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/565/bogusfile b/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/565/selftest1.png b/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/565/selftest1.png
deleted file mode 100644
index 6fd4126d10..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-empty-dir/output-actual/writePath/565/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/565/selftest2.png b/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/565/selftest2.png
deleted file mode 100644
index 5ef2f452b3..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/565/selftest2.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-empty-dir/output-actual/writePath/565/selftest2.png]
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/8888/bogusfile b/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/8888/selftest1.png b/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/8888/selftest1.png
deleted file mode 100644
index 8d82f51f6e..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-empty-dir/output-actual/writePath/8888/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/8888/selftest2.png b/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/8888/selftest2.png
deleted file mode 100644
index 9abe14053b..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/8888/selftest2.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-empty-dir/output-actual/writePath/8888/selftest2.png]
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/bogusfile b/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt
deleted file mode 100644
index fad1ffe5bd..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "actual-results" : {
- "failed" : null,
- "failure-ignored" : null,
- "no-comparison" : null,
- "succeeded" : {
- "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
- }
- },
- "expected-results" : {
- "565/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 12927999507540085554 ]
- ],
- "ignore-failure" : false
- },
- "8888/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 1209453360120438698 ]
- ],
- "ignore-failure" : false
- }
- }
-}
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/mismatchPath/565/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/mismatchPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/mismatchPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/mismatchPath/8888/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/mismatchPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/mismatchPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/missingExpectationsPath/565/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/missingExpectationsPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/missingExpectationsPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/missingExpectationsPath/8888/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/missingExpectationsPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/missingExpectationsPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/return_value b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/return_value
deleted file mode 100644
index 573541ac97..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/565/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/565/selftest1.png b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/565/selftest1.png
deleted file mode 100644
index be0614f1c7..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-identical-bytes-images/output-actual/writePath/565/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/8888/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/8888/selftest1.png b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/8888/selftest1.png
deleted file mode 100644
index 6575039622..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-identical-bytes-images/output-actual/writePath/8888/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt
deleted file mode 100644
index fad1ffe5bd..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "actual-results" : {
- "failed" : null,
- "failure-ignored" : null,
- "no-comparison" : null,
- "succeeded" : {
- "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
- }
- },
- "expected-results" : {
- "565/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 12927999507540085554 ]
- ],
- "ignore-failure" : false
- },
- "8888/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 1209453360120438698 ]
- ],
- "ignore-failure" : false
- }
- }
-}
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/mismatchPath/565/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/mismatchPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/mismatchPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/mismatchPath/8888/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/mismatchPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/mismatchPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/missingExpectationsPath/565/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/missingExpectationsPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/missingExpectationsPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/missingExpectationsPath/8888/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/missingExpectationsPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/missingExpectationsPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/return_value b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/return_value
deleted file mode 100644
index 573541ac97..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/565/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/565/selftest1.png b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/565/selftest1.png
deleted file mode 100644
index 31853e30cd..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-identical-bytes-json/output-actual/writePath/565/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/8888/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/8888/selftest1.png b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/8888/selftest1.png
deleted file mode 100644
index ee80ce2e71..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-identical-bytes-json/output-actual/writePath/8888/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/bogusfile b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt
deleted file mode 100644
index fad1ffe5bd..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "actual-results" : {
- "failed" : null,
- "failure-ignored" : null,
- "no-comparison" : null,
- "succeeded" : {
- "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
- }
- },
- "expected-results" : {
- "565/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 12927999507540085554 ]
- ],
- "ignore-failure" : false
- },
- "8888/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 1209453360120438698 ]
- ],
- "ignore-failure" : false
- }
- }
-}
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/mismatchPath/565/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/mismatchPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/mismatchPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/mismatchPath/8888/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/mismatchPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/mismatchPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/missingExpectationsPath/565/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/missingExpectationsPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/missingExpectationsPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/missingExpectationsPath/8888/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/missingExpectationsPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/missingExpectationsPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/return_value b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/return_value
deleted file mode 100644
index 573541ac97..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/565/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/565/selftest1.png b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/565/selftest1.png
deleted file mode 100644
index 8961f2bfd0..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-identical-pixels-images/output-actual/writePath/565/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/8888/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/8888/selftest1.png b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/8888/selftest1.png
deleted file mode 100644
index 19b3ba30ad..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-identical-pixels-images/output-actual/writePath/8888/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt
deleted file mode 100644
index fad1ffe5bd..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "actual-results" : {
- "failed" : null,
- "failure-ignored" : null,
- "no-comparison" : null,
- "succeeded" : {
- "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
- }
- },
- "expected-results" : {
- "565/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 12927999507540085554 ]
- ],
- "ignore-failure" : false
- },
- "8888/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 1209453360120438698 ]
- ],
- "ignore-failure" : false
- }
- }
-}
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/mismatchPath/565/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/mismatchPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/mismatchPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/mismatchPath/8888/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/mismatchPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/mismatchPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/missingExpectationsPath/565/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/missingExpectationsPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/missingExpectationsPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/missingExpectationsPath/8888/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/missingExpectationsPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/missingExpectationsPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/return_value b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/return_value
deleted file mode 100644
index 573541ac97..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/565/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/565/selftest1.png b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/565/selftest1.png
deleted file mode 100644
index 357c3f97d7..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-identical-pixels-json/output-actual/writePath/565/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/8888/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/8888/selftest1.png b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/8888/selftest1.png
deleted file mode 100644
index 1da34ea9d4..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/compared-against-identical-pixels-json/output-actual/writePath/8888/selftest1.png]
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/bogusfile b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/compared-against-nonexistent-dir/output-expected/return_value b/gm/tests/outputs/compared-against-nonexistent-dir/output-expected/return_value
deleted file mode 100644
index ace9d03621..0000000000
--- a/gm/tests/outputs/compared-against-nonexistent-dir/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-255
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt
deleted file mode 100644
index 7832eb0234..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "actual-results" : {
- "failed" : {
- "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
- },
- "failure-ignored" : null,
- "no-comparison" : null,
- "succeeded" : null
- },
- "expected-results" : {
- "565/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 8863920166200910451 ]
- ],
- "ignore-failure" : false
- },
- "8888/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 13451349865803053525 ]
- ],
- "ignore-failure" : false
- }
- }
-}
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/565/bogusfile b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/565/selftest1.png b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/565/selftest1.png
deleted file mode 100644
index 95247f83b8..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignore-expectations-mismatch/output-actual/mismatchPath/565/selftest1.png]
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/8888/bogusfile b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/8888/selftest1.png b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/8888/selftest1.png
deleted file mode 100644
index 73c78418da..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignore-expectations-mismatch/output-actual/mismatchPath/8888/selftest1.png]
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/missingExpectationsPath/565/bogusfile b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/missingExpectationsPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/missingExpectationsPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/missingExpectationsPath/8888/bogusfile b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/missingExpectationsPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/missingExpectationsPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/return_value b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/return_value
deleted file mode 100644
index 573541ac97..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/565/bogusfile b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/565/selftest1.png b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/565/selftest1.png
deleted file mode 100644
index 5b86addaea..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignore-expectations-mismatch/output-actual/writePath/565/selftest1.png]
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/8888/bogusfile b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/8888/selftest1.png b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/8888/selftest1.png
deleted file mode 100644
index b33ea833ac..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignore-expectations-mismatch/output-actual/writePath/8888/selftest1.png]
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/bogusfile b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/json-summary.txt b/gm/tests/outputs/ignoring-one-test/output-expected/json-summary.txt
deleted file mode 100644
index 1b667830ad..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/json-summary.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "actual-results" : {
- "failed" : {
- "565/selftest2.png" : [ "bitmap-64bitMD5", 8863920166200910451 ],
- "8888/selftest2.png" : [ "bitmap-64bitMD5", 13451349865803053525 ]
- },
- "failure-ignored" : {
- "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
- },
- "no-comparison" : null,
- "succeeded" : null
- },
- "expected-results" : {
- "565/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 8863920166200910451 ]
- ],
- "ignore-failure" : true
- },
- "565/selftest2.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 12927999507540085554 ]
- ],
- "ignore-failure" : false
- },
- "8888/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 13451349865803053525 ]
- ],
- "ignore-failure" : true
- },
- "8888/selftest2.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 1209453360120438698 ]
- ],
- "ignore-failure" : false
- }
- }
-}
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/565/bogusfile b/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/565/selftest1.png b/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/565/selftest1.png
deleted file mode 100644
index c93c6886b8..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignoring-one-test/output-actual/mismatchPath/565/selftest1.png]
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/565/selftest2.png b/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/565/selftest2.png
deleted file mode 100644
index dab977ad2b..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/565/selftest2.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignoring-one-test/output-actual/mismatchPath/565/selftest2.png]
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/8888/bogusfile b/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/8888/selftest1.png b/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/8888/selftest1.png
deleted file mode 100644
index 1ce89fe6d4..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignoring-one-test/output-actual/mismatchPath/8888/selftest1.png]
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/8888/selftest2.png b/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/8888/selftest2.png
deleted file mode 100644
index 882a446881..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/8888/selftest2.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignoring-one-test/output-actual/mismatchPath/8888/selftest2.png]
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/missingExpectationsPath/565/bogusfile b/gm/tests/outputs/ignoring-one-test/output-expected/missingExpectationsPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/missingExpectationsPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/missingExpectationsPath/8888/bogusfile b/gm/tests/outputs/ignoring-one-test/output-expected/missingExpectationsPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/missingExpectationsPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/ignoring-one-test/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/return_value b/gm/tests/outputs/ignoring-one-test/output-expected/return_value
deleted file mode 100644
index ace9d03621..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-255
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/565/bogusfile b/gm/tests/outputs/ignoring-one-test/output-expected/writePath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/565/selftest1.png b/gm/tests/outputs/ignoring-one-test/output-expected/writePath/565/selftest1.png
deleted file mode 100644
index 0e665b884e..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignoring-one-test/output-actual/writePath/565/selftest1.png]
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/565/selftest2.png b/gm/tests/outputs/ignoring-one-test/output-expected/writePath/565/selftest2.png
deleted file mode 100644
index b11088fd90..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/565/selftest2.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignoring-one-test/output-actual/writePath/565/selftest2.png]
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/8888/bogusfile b/gm/tests/outputs/ignoring-one-test/output-expected/writePath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/8888/selftest1.png b/gm/tests/outputs/ignoring-one-test/output-expected/writePath/8888/selftest1.png
deleted file mode 100644
index 5ea72babc7..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignoring-one-test/output-actual/writePath/8888/selftest1.png]
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/8888/selftest2.png b/gm/tests/outputs/ignoring-one-test/output-expected/writePath/8888/selftest2.png
deleted file mode 100644
index 3eeb0084e9..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/8888/selftest2.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignoring-one-test/output-actual/writePath/8888/selftest2.png]
diff --git a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/bogusfile b/gm/tests/outputs/ignoring-one-test/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-one-test/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/json-summary.txt b/gm/tests/outputs/ignoring-some-failures/output-expected/json-summary.txt
deleted file mode 100644
index b152d6d035..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/json-summary.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "actual-results" : {
- "failed" : {
- "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
- },
- "failure-ignored" : {
- "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ]
- },
- "no-comparison" : null,
- "succeeded" : null
- },
- "expected-results" : {
- "565/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 8863920166200910451 ]
- ],
- "ignore-failure" : true
- },
- "8888/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 13451349865803053525 ]
- ],
- "ignore-failure" : false
- }
- }
-}
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/565/bogusfile b/gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/565/selftest1.png b/gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/565/selftest1.png
deleted file mode 100644
index 5a30830f5a..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignoring-some-failures/output-actual/mismatchPath/565/selftest1.png]
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/8888/bogusfile b/gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/8888/selftest1.png b/gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/8888/selftest1.png
deleted file mode 100644
index 734abd0f49..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignoring-some-failures/output-actual/mismatchPath/8888/selftest1.png]
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/missingExpectationsPath/565/bogusfile b/gm/tests/outputs/ignoring-some-failures/output-expected/missingExpectationsPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/missingExpectationsPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/missingExpectationsPath/8888/bogusfile b/gm/tests/outputs/ignoring-some-failures/output-expected/missingExpectationsPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/missingExpectationsPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/ignoring-some-failures/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/return_value b/gm/tests/outputs/ignoring-some-failures/output-expected/return_value
deleted file mode 100644
index ace9d03621..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-255
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/writePath/565/bogusfile b/gm/tests/outputs/ignoring-some-failures/output-expected/writePath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/writePath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/writePath/565/selftest1.png b/gm/tests/outputs/ignoring-some-failures/output-expected/writePath/565/selftest1.png
deleted file mode 100644
index 4bc8ce56b4..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/writePath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignoring-some-failures/output-actual/writePath/565/selftest1.png]
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/writePath/8888/bogusfile b/gm/tests/outputs/ignoring-some-failures/output-expected/writePath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/writePath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/writePath/8888/selftest1.png b/gm/tests/outputs/ignoring-some-failures/output-expected/writePath/8888/selftest1.png
deleted file mode 100644
index f7f6539d50..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/writePath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/ignoring-some-failures/output-actual/writePath/8888/selftest1.png]
diff --git a/gm/tests/outputs/ignoring-some-failures/output-expected/writePath/bogusfile b/gm/tests/outputs/ignoring-some-failures/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/ignoring-some-failures/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt b/gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt
deleted file mode 100644
index f6cd87b8dd..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "actual-results" : {
- "failed" : null,
- "failure-ignored" : null,
- "no-comparison" : {
- "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "565/selftest2.png" : [ "bitmap-64bitMD5", 8863920166200910451 ],
- "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ],
- "8888/selftest2.png" : [ "bitmap-64bitMD5", 13451349865803053525 ]
- },
- "succeeded" : null
- },
- "expected-results" : null
-}
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/mismatchPath/565/bogusfile b/gm/tests/outputs/intentionally-skipped-tests/output-expected/mismatchPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/mismatchPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/mismatchPath/8888/bogusfile b/gm/tests/outputs/intentionally-skipped-tests/output-expected/mismatchPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/mismatchPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/intentionally-skipped-tests/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/missingExpectationsPath/565/bogusfile b/gm/tests/outputs/intentionally-skipped-tests/output-expected/missingExpectationsPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/missingExpectationsPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/missingExpectationsPath/8888/bogusfile b/gm/tests/outputs/intentionally-skipped-tests/output-expected/missingExpectationsPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/missingExpectationsPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/intentionally-skipped-tests/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/return_value b/gm/tests/outputs/intentionally-skipped-tests/output-expected/return_value
deleted file mode 100644
index 573541ac97..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/565/bogusfile b/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/565/selftest1.png b/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/565/selftest1.png
deleted file mode 100644
index fd1af59fce..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/intentionally-skipped-tests/output-actual/writePath/565/selftest1.png]
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/565/selftest2.png b/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/565/selftest2.png
deleted file mode 100644
index 44bbef7e17..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/565/selftest2.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/intentionally-skipped-tests/output-actual/writePath/565/selftest2.png]
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/8888/bogusfile b/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/8888/selftest1.png b/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/8888/selftest1.png
deleted file mode 100644
index a322ded4f6..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/intentionally-skipped-tests/output-actual/writePath/8888/selftest1.png]
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/8888/selftest2.png b/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/8888/selftest2.png
deleted file mode 100644
index c56ee69561..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/8888/selftest2.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/intentionally-skipped-tests/output-actual/writePath/8888/selftest2.png]
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/bogusfile b/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/no-hierarchy/output-expected/json-summary.txt b/gm/tests/outputs/no-hierarchy/output-expected/json-summary.txt
deleted file mode 100644
index b3e2a8150f..0000000000
--- a/gm/tests/outputs/no-hierarchy/output-expected/json-summary.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "actual-results" : {
- "failed" : {
- "selftest1_565.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "selftest1_8888.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
- },
- "failure-ignored" : null,
- "no-comparison" : null,
- "succeeded" : null
- },
- "expected-results" : {
- "selftest1_565.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 8863920166200910451 ]
- ],
- "ignore-failure" : false
- },
- "selftest1_8888.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 13451349865803053525 ]
- ],
- "ignore-failure" : false
- }
- }
-}
diff --git a/gm/tests/outputs/no-hierarchy/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/no-hierarchy/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/no-hierarchy/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/no-hierarchy/output-expected/mismatchPath/selftest1_565.png b/gm/tests/outputs/no-hierarchy/output-expected/mismatchPath/selftest1_565.png
deleted file mode 100644
index 16040c53c0..0000000000
--- a/gm/tests/outputs/no-hierarchy/output-expected/mismatchPath/selftest1_565.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/no-hierarchy/output-actual/mismatchPath/selftest1_565.png]
diff --git a/gm/tests/outputs/no-hierarchy/output-expected/mismatchPath/selftest1_8888.png b/gm/tests/outputs/no-hierarchy/output-expected/mismatchPath/selftest1_8888.png
deleted file mode 100644
index 4d506f8619..0000000000
--- a/gm/tests/outputs/no-hierarchy/output-expected/mismatchPath/selftest1_8888.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/no-hierarchy/output-actual/mismatchPath/selftest1_8888.png]
diff --git a/gm/tests/outputs/no-hierarchy/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/no-hierarchy/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/no-hierarchy/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/no-hierarchy/output-expected/return_value b/gm/tests/outputs/no-hierarchy/output-expected/return_value
deleted file mode 100644
index ace9d03621..0000000000
--- a/gm/tests/outputs/no-hierarchy/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-255
diff --git a/gm/tests/outputs/no-hierarchy/output-expected/writePath/bogusfile b/gm/tests/outputs/no-hierarchy/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/no-hierarchy/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/no-hierarchy/output-expected/writePath/selftest1_565.png b/gm/tests/outputs/no-hierarchy/output-expected/writePath/selftest1_565.png
deleted file mode 100644
index ddb053f75b..0000000000
--- a/gm/tests/outputs/no-hierarchy/output-expected/writePath/selftest1_565.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/no-hierarchy/output-actual/writePath/selftest1_565.png]
diff --git a/gm/tests/outputs/no-hierarchy/output-expected/writePath/selftest1_8888.png b/gm/tests/outputs/no-hierarchy/output-expected/writePath/selftest1_8888.png
deleted file mode 100644
index 1bf8130365..0000000000
--- a/gm/tests/outputs/no-hierarchy/output-expected/writePath/selftest1_8888.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/no-hierarchy/output-actual/writePath/selftest1_8888.png]
diff --git a/gm/tests/outputs/no-readpath/output-expected/json-summary.txt b/gm/tests/outputs/no-readpath/output-expected/json-summary.txt
deleted file mode 100644
index 006516eda6..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/json-summary.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "actual-results" : {
- "failed" : null,
- "failure-ignored" : null,
- "no-comparison" : {
- "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
- },
- "succeeded" : null
- },
- "expected-results" : null
-}
diff --git a/gm/tests/outputs/no-readpath/output-expected/mismatchPath/565/bogusfile b/gm/tests/outputs/no-readpath/output-expected/mismatchPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/mismatchPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/no-readpath/output-expected/mismatchPath/8888/bogusfile b/gm/tests/outputs/no-readpath/output-expected/mismatchPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/mismatchPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/no-readpath/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/no-readpath/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/no-readpath/output-expected/missingExpectationsPath/565/bogusfile b/gm/tests/outputs/no-readpath/output-expected/missingExpectationsPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/missingExpectationsPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/no-readpath/output-expected/missingExpectationsPath/8888/bogusfile b/gm/tests/outputs/no-readpath/output-expected/missingExpectationsPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/missingExpectationsPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/no-readpath/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/no-readpath/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/no-readpath/output-expected/return_value b/gm/tests/outputs/no-readpath/output-expected/return_value
deleted file mode 100644
index 573541ac97..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/gm/tests/outputs/no-readpath/output-expected/writePath/565/bogusfile b/gm/tests/outputs/no-readpath/output-expected/writePath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/writePath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/no-readpath/output-expected/writePath/565/selftest1.png b/gm/tests/outputs/no-readpath/output-expected/writePath/565/selftest1.png
deleted file mode 100644
index 2943f0a91c..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/writePath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/no-readpath/output-actual/writePath/565/selftest1.png]
diff --git a/gm/tests/outputs/no-readpath/output-expected/writePath/8888/bogusfile b/gm/tests/outputs/no-readpath/output-expected/writePath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/writePath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/no-readpath/output-expected/writePath/8888/selftest1.png b/gm/tests/outputs/no-readpath/output-expected/writePath/8888/selftest1.png
deleted file mode 100644
index 50a0c247ae..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/writePath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/no-readpath/output-actual/writePath/8888/selftest1.png]
diff --git a/gm/tests/outputs/no-readpath/output-expected/writePath/bogusfile b/gm/tests/outputs/no-readpath/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/no-readpath/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/nonverbose/output-expected/json-summary.txt b/gm/tests/outputs/nonverbose/output-expected/json-summary.txt
deleted file mode 100644
index 57aee04201..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/json-summary.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "actual-results" : {
- "failed" : null,
- "failure-ignored" : null,
- "no-comparison" : {
- "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
- },
- "succeeded" : null
- },
- "expected-results" : {
- "565/selftest1.png" : {
- "allowed-digests" : null,
- "ignore-failure" : false
- },
- "8888/selftest1.png" : {
- "allowed-digests" : null,
- "ignore-failure" : false
- }
- }
-}
diff --git a/gm/tests/outputs/nonverbose/output-expected/mismatchPath/565/bogusfile b/gm/tests/outputs/nonverbose/output-expected/mismatchPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/mismatchPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/nonverbose/output-expected/mismatchPath/8888/bogusfile b/gm/tests/outputs/nonverbose/output-expected/mismatchPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/mismatchPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/nonverbose/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/nonverbose/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/565/bogusfile b/gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/565/selftest1.png b/gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/565/selftest1.png
deleted file mode 100644
index a8ef872350..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/nonverbose/output-actual/missingExpectationsPath/565/selftest1.png]
diff --git a/gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/8888/bogusfile b/gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/8888/selftest1.png b/gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/8888/selftest1.png
deleted file mode 100644
index 9132f60667..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/nonverbose/output-actual/missingExpectationsPath/8888/selftest1.png]
diff --git a/gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/nonverbose/output-expected/return_value b/gm/tests/outputs/nonverbose/output-expected/return_value
deleted file mode 100644
index 573541ac97..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/gm/tests/outputs/nonverbose/output-expected/writePath/565/bogusfile b/gm/tests/outputs/nonverbose/output-expected/writePath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/writePath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/nonverbose/output-expected/writePath/565/selftest1.png b/gm/tests/outputs/nonverbose/output-expected/writePath/565/selftest1.png
deleted file mode 100644
index 6b9d422388..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/writePath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/nonverbose/output-actual/writePath/565/selftest1.png]
diff --git a/gm/tests/outputs/nonverbose/output-expected/writePath/8888/bogusfile b/gm/tests/outputs/nonverbose/output-expected/writePath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/writePath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/nonverbose/output-expected/writePath/8888/selftest1.png b/gm/tests/outputs/nonverbose/output-expected/writePath/8888/selftest1.png
deleted file mode 100644
index 4f04a60380..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/writePath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/nonverbose/output-actual/writePath/8888/selftest1.png]
diff --git a/gm/tests/outputs/nonverbose/output-expected/writePath/bogusfile b/gm/tests/outputs/nonverbose/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/nonverbose/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt b/gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt
deleted file mode 100644
index ebe8b592b0..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "actual-results" : {
- "failed" : {
- "565/selftest1-pipe.png" : [ "bitmap-64bitMD5", 6140979239232854774 ],
- "8888/selftest1-pipe.png" : [ "bitmap-64bitMD5", 6140979239232854774 ]
- },
- "failure-ignored" : null,
- "no-comparison" : null,
- "succeeded" : {
- "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
- "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
- }
- },
- "expected-results" : {
- "565/selftest1-pipe.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 12927999507540085554 ]
- ],
- "ignore-failure" : false
- },
- "565/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 12927999507540085554 ]
- ],
- "ignore-failure" : false
- },
- "8888/selftest1-pipe.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 1209453360120438698 ]
- ],
- "ignore-failure" : false
- },
- "8888/selftest1.png" : {
- "allowed-digests" : [
- [ "bitmap-64bitMD5", 1209453360120438698 ]
- ],
- "ignore-failure" : false
- }
- }
-}
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/565/bogusfile b/gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/565/selftest1-pipe.png b/gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/565/selftest1-pipe.png
deleted file mode 100644
index 6e665c4e55..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/565/selftest1-pipe.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/pipe-playback-failure/output-actual/mismatchPath/565/selftest1-pipe.png]
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/8888/bogusfile b/gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/8888/selftest1-pipe.png b/gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/8888/selftest1-pipe.png
deleted file mode 100644
index 0426b8ce9d..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/8888/selftest1-pipe.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/pipe-playback-failure/output-actual/mismatchPath/8888/selftest1-pipe.png]
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/bogusfile b/gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/mismatchPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/missingExpectationsPath/565/bogusfile b/gm/tests/outputs/pipe-playback-failure/output-expected/missingExpectationsPath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/missingExpectationsPath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/missingExpectationsPath/8888/bogusfile b/gm/tests/outputs/pipe-playback-failure/output-expected/missingExpectationsPath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/missingExpectationsPath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/missingExpectationsPath/bogusfile b/gm/tests/outputs/pipe-playback-failure/output-expected/missingExpectationsPath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/missingExpectationsPath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/return_value b/gm/tests/outputs/pipe-playback-failure/output-expected/return_value
deleted file mode 100644
index ace9d03621..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/return_value
+++ /dev/null
@@ -1 +0,0 @@
-255
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/writePath/565/bogusfile b/gm/tests/outputs/pipe-playback-failure/output-expected/writePath/565/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/writePath/565/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/writePath/565/selftest1.png b/gm/tests/outputs/pipe-playback-failure/output-expected/writePath/565/selftest1.png
deleted file mode 100644
index 5fec2967aa..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/writePath/565/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/pipe-playback-failure/output-actual/writePath/565/selftest1.png]
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/writePath/8888/bogusfile b/gm/tests/outputs/pipe-playback-failure/output-expected/writePath/8888/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/writePath/8888/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/writePath/8888/selftest1.png b/gm/tests/outputs/pipe-playback-failure/output-expected/writePath/8888/selftest1.png
deleted file mode 100644
index 975f68fcb2..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/writePath/8888/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/pipe-playback-failure/output-actual/writePath/8888/selftest1.png]
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/writePath/bogusfile b/gm/tests/outputs/pipe-playback-failure/output-expected/writePath/bogusfile
deleted file mode 100644
index d86cd5bdd8..0000000000
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/writePath/bogusfile
+++ /dev/null
@@ -1 +0,0 @@
-Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories.
diff --git a/gm/tests/rebaseline.sh b/gm/tests/rebaseline.sh
deleted file mode 100755
index 608e66791a..0000000000
--- a/gm/tests/rebaseline.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-# Rebaseline the outputs/*/output-expected/ subdirectories used by the
-# gm self-tests.
-# Use with caution: are you sure the new results are actually correct?
-#
-# TODO: currently, this must be run on Linux to generate baselines that match
-# the ones on the housekeeper bot (which runs on Linux... see
-# http://70.32.156.51:10117/builders/Skia_PerCommit_House_Keeping/builds/1417/steps/RunGmSelfTests/logs/stdio )
-# See https://code.google.com/p/skia/issues/detail?id=677
-# ('make tools/tests/run.sh work cross-platform')
-
-function replace_expected_with_actual {
- # Delete all the expected output files
- EXPECTED_FILES=$(find outputs/*/output-expected -type f | grep -v /\.svn/)
- for EXPECTED_FILE in $EXPECTED_FILES; do
- rm $EXPECTED_FILE
- done
-
- # Copy all the actual output files into the "expected" directories,
- # creating new subdirs as we go.
- ACTUAL_FILES=$(find outputs/*/output-actual -type f | grep -v /\.svn/)
- for ACTUAL_FILE in $ACTUAL_FILES; do
- EXPECTED_FILE=${ACTUAL_FILE//actual/expected}
- mkdir -p $(dirname $EXPECTED_FILE)
- cp $ACTUAL_FILE $EXPECTED_FILE
- done
-}
-
-function svn_add_new_files {
- # Delete all the "actual" directories, so we can svn-add any new "expected"
- # directories without adding the "actual" ones.
- rm -rf outputs/*/output-actual
- FILES=$(svn stat outputs/* | grep ^\? | awk '{print $2}')
- for FILE in $FILES; do
- svn add $FILE
- done
- FILES=$(svn stat outputs/*/output-expected | grep ^\? | awk '{print $2}')
- for FILE in $FILES; do
- svn add $FILE
- done
-}
-
-function svn_delete_old_files {
- FILES=$(svn stat outputs/*/output-expected | grep ^\! | awk '{print $2}')
- for FILE in $FILES; do
- svn rm $FILE
- done
- FILES=$(svn stat outputs/* | grep ^\! | awk '{print $2}')
- for FILE in $FILES; do
- svn rm $FILE
- done
-}
-
-
-# cd into the gm self-test dir
-cd $(dirname $0)
-
-./run.sh
-SELFTEST_RESULT=$?
-echo
-if [ "$SELFTEST_RESULT" != "0" ]; then
- replace_expected_with_actual
- svn_add_new_files
- svn_delete_old_files
- echo "Rebaseline completed. If you run run.sh now, it should succeed."
-else
- echo "Self-tests succeeded, nothing to rebaseline."
-fi
-exit $SELFTEST_RESULT
-
diff --git a/gm/tests/run.sh b/gm/tests/run.sh
deleted file mode 100755
index 52ed6f309f..0000000000
--- a/gm/tests/run.sh
+++ /dev/null
@@ -1,277 +0,0 @@
-#!/bin/bash
-
-# Self-tests for gm, based on tools/tests/run.sh
-#
-# These tests are run by the Skia_PerCommit_House_Keeping bot at every commit,
-# so make sure that they still pass when you make changes to gm!
-#
-# To generate new baselines when gm behavior changes, run gm/tests/rebaseline.sh
-#
-# TODO: because this is written as a shell script (instead of, say, Python)
-# it only runs on Linux and Mac.
-# See https://code.google.com/p/skia/issues/detail?id=677
-# ('make tools/tests/run.sh work cross-platform')
-# Ideally, these tests should pass on all development platforms...
-# otherwise, how can developers be expected to test them before committing a
-# change?
-
-# cd into .../trunk so all the paths will work
-cd $(dirname $0)/../..
-
-# TODO(epoger): make it look in Release and/or Debug
-GM_BINARY=out/Debug/gm
-
-OUTPUT_ACTUAL_SUBDIR=output-actual
-OUTPUT_EXPECTED_SUBDIR=output-expected
-CONFIGS="--config 8888 565"
-
-ENCOUNTERED_ANY_ERRORS=0
-
-# Compare contents of all files within directories $1 and $2,
-# EXCEPT for any dotfiles.
-# If there are any differences, a description is written to stdout and
-# we exit with a nonzero return value.
-# Otherwise, we write nothing to stdout and return.
-function compare_directories {
- if [ $# != 2 ]; then
- echo "compare_directories requires exactly 2 parameters, got $#"
- exit 1
- fi
- diff -r --exclude=.* $1 $2
- if [ $? != 0 ]; then
- echo "failed in: compare_directories $1 $2"
- ENCOUNTERED_ANY_ERRORS=1
- fi
-}
-
-# Run a command, and validate that it succeeds (returns 0).
-function assert_passes {
- COMMAND="$1"
- echo
- echo "assert_passes $COMMAND ..."
- $COMMAND
- if [ $? != 0 ]; then
- echo "This command was supposed to pass, but failed: [$COMMAND]"
- ENCOUNTERED_ANY_ERRORS=1
- fi
-}
-
-# Run a command, and validate that it fails (returns nonzero).
-function assert_fails {
- COMMAND="$1"
- echo
- echo "assert_fails $COMMAND ..."
- $COMMAND
- if [ $? == 0 ]; then
- echo "This command was supposed to fail, but passed: [$COMMAND]"
- ENCOUNTERED_ANY_ERRORS=1
- fi
-}
-
-# Run gm...
-# - with the arguments in $1
-# - 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 .
-function gm_test {
- if [ $# != 2 ]; then
- echo "gm_test requires exactly 2 parameters, got $#"
- exit 1
- fi
- GM_ARGS="$1"
- ACTUAL_OUTPUT_DIR="$2/$OUTPUT_ACTUAL_SUBDIR"
- EXPECTED_OUTPUT_DIR="$2/$OUTPUT_EXPECTED_SUBDIR"
- JSON_SUMMARY_FILE="$ACTUAL_OUTPUT_DIR/json-summary.txt"
-
- rm -rf $ACTUAL_OUTPUT_DIR
- mkdir -p $ACTUAL_OUTPUT_DIR
-
- COMMAND="$GM_BINARY $GM_ARGS --writeJsonSummaryPath $JSON_SUMMARY_FILE --writePath $ACTUAL_OUTPUT_DIR/writePath --mismatchPath $ACTUAL_OUTPUT_DIR/mismatchPath --missingExpectationsPath $ACTUAL_OUTPUT_DIR/missingExpectationsPath"
-
- $COMMAND
- echo $? >$ACTUAL_OUTPUT_DIR/return_value
-
- # 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
- # ('gcl/upload.py fail to upload binary files to rietveld')
- for IMAGEFILE in $(find $ACTUAL_OUTPUT_DIR -name \*.png); do
- echo "[contents of $IMAGEFILE]" >$IMAGEFILE
- done
- for IMAGEFILE in $(find $ACTUAL_OUTPUT_DIR -name \*.pdf); do
- echo "[contents of $IMAGEFILE]" >$IMAGEFILE
- done
-
- # Add a file to any empty subdirectories.
- for DIR in $(find $ACTUAL_OUTPUT_DIR -mindepth 1 -type d); do
- echo "Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories." >$DIR/bogusfile
- done
-
- compare_directories $EXPECTED_OUTPUT_DIR $ACTUAL_OUTPUT_DIR
-}
-
-# Swap contents of two files at paths $1 and $2.
-function swap_files {
- if [ $# != 2 ]; then
- echo "swap_files requires exactly 2 parameters, got $#"
- exit 1
- fi
- mv "$1" "$1.tmp"
- mv "$2" "$1"
- mv "$1.tmp" "$2"
-}
-
-# Create input dir (at path $1) with expectations (both image and json)
-# that gm will match or mismatch as appropriate.
-#
-# We used to check these files into SVN, but then we needed to rebaseline them
-# when our drawing changed at all... so, as proposed in
-# http://code.google.com/p/skia/issues/detail?id=1068 , we generate them
-# new each time.
-function create_inputs_dir {
- if [ $# != 1 ]; then
- echo "create_inputs_dir requires exactly 1 parameter, got $#"
- exit 1
- fi
- INPUTS_DIR="$1"
- IMAGES_DIR=$INPUTS_DIR/images
- JSON_DIR=$INPUTS_DIR/json
- mkdir -p $IMAGES_DIR $JSON_DIR
-
- THIS_IMAGE_DIR=$IMAGES_DIR/identical-bytes
- mkdir -p $THIS_IMAGE_DIR
- # Run GM to write out the images actually generated.
- $GM_BINARY --hierarchy --match selftest1 $CONFIGS -w $THIS_IMAGE_DIR
- # Run GM again to read in those images and write them out as a JSON summary.
- $GM_BINARY --hierarchy --match selftest1 $CONFIGS -r $THIS_IMAGE_DIR \
- --writeJsonSummaryPath $JSON_DIR/identical-bytes.json
-
- THIS_IMAGE_DIR=$IMAGES_DIR/identical-pixels
- mkdir -p $THIS_IMAGE_DIR
- $GM_BINARY --hierarchy --match selftest1 $CONFIGS -w $THIS_IMAGE_DIR
- echo "more bytes that do not change the image pixels" \
- >> $THIS_IMAGE_DIR/8888/selftest1.png
- echo "more bytes that do not change the image pixels" \
- >> $THIS_IMAGE_DIR/565/selftest1.png
- $GM_BINARY --hierarchy --match selftest1 $CONFIGS -r $THIS_IMAGE_DIR \
- --writeJsonSummaryPath $JSON_DIR/identical-pixels.json
-
- THIS_IMAGE_DIR=$IMAGES_DIR/different-pixels
- mkdir -p $THIS_IMAGE_DIR
- $GM_BINARY --hierarchy --match selftest $CONFIGS -w $THIS_IMAGE_DIR
- swap_files $THIS_IMAGE_DIR/8888/selftest2.png $THIS_IMAGE_DIR/8888/selftest1.png
- swap_files $THIS_IMAGE_DIR/565/selftest2.png $THIS_IMAGE_DIR/565/selftest1.png
- $GM_BINARY --hierarchy --match selftest $CONFIGS -r $THIS_IMAGE_DIR \
- --writeJsonSummaryPath $JSON_DIR/different-pixels.json
-
- # Create another JSON expectations file which is identical to
- # different-pixels.json, but in which the *first* ignore-failure is changed
- # from false to true.
- OLD='"ignore-failure" : false'
- NEW='"ignore-failure" : true'
- sed -e "0,/$OLD/{s/$OLD/$NEW/}" $JSON_DIR/different-pixels.json \
- >$JSON_DIR/different-pixels-ignore-some-failures.json
-
- THIS_IMAGE_DIR=$IMAGES_DIR/different-pixels-no-hierarchy
- mkdir -p $THIS_IMAGE_DIR
- $GM_BINARY --match selftest2 $CONFIGS -w $THIS_IMAGE_DIR
- mv $THIS_IMAGE_DIR/selftest2_8888.png $THIS_IMAGE_DIR/selftest1_8888.png
- mv $THIS_IMAGE_DIR/selftest2_565.png $THIS_IMAGE_DIR/selftest1_565.png
- $GM_BINARY --match selftest1 $CONFIGS -r $THIS_IMAGE_DIR \
- --writeJsonSummaryPath $JSON_DIR/different-pixels-no-hierarchy.json
-
- mkdir -p $IMAGES_DIR/empty-dir
-
- echo "# Comment line" >$GM_IGNORE_FAILURES_FILE
- echo "" >>$GM_IGNORE_FAILURES_FILE
- echo "# ignore any runs of the 'selftest1' test" >>$GM_IGNORE_FAILURES_FILE
- echo "selftest1" >>$GM_IGNORE_FAILURES_FILE
- echo "" >>$GM_IGNORE_FAILURES_FILE
- echo "# make sure we don't do partial matches (should NOT ignore 'selftest2' runs)" >>$GM_IGNORE_FAILURES_FILE
- echo "selftest" >>$GM_IGNORE_FAILURES_FILE
-}
-
-GM_TESTDIR=gm/tests
-GM_INPUTS=$GM_TESTDIR/inputs
-GM_OUTPUTS=$GM_TESTDIR/outputs
-GM_TEMPFILES=$GM_TESTDIR/tempfiles
-GM_IGNORE_FAILURES_FILE=$GM_INPUTS/ignored-tests.txt
-
-create_inputs_dir $GM_INPUTS
-
-# Compare generated image against an input image file with identical bytes.
-gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/images/identical-bytes" "$GM_OUTPUTS/compared-against-identical-bytes-images"
-gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/identical-bytes.json" "$GM_OUTPUTS/compared-against-identical-bytes-json"
-
-# Compare generated image against an input image file with identical pixels but different PNG encoding.
-gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/images/identical-pixels" "$GM_OUTPUTS/compared-against-identical-pixels-images"
-gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/identical-pixels.json" "$GM_OUTPUTS/compared-against-identical-pixels-json"
-
-# Compare generated image against an input image file with different pixels.
-gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/images/different-pixels" "$GM_OUTPUTS/compared-against-different-pixels-images"
-gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/different-pixels.json" "$GM_OUTPUTS/compared-against-different-pixels-json"
-
-# Exercise --ignoreFailuresFile flag.
-# This should run two GM tests: selftest1 and selftest2.
-# Failures in selftest1 should be ignored, but failures in selftest2 should not.
-gm_test "--verbose --hierarchy --match selftest --ignoreFailuresFile $GM_IGNORE_FAILURES_FILE $CONFIGS -r $GM_INPUTS/json/different-pixels.json" "$GM_OUTPUTS/ignoring-one-test"
-
-# Compare different pixels, but with a SUBSET of the expectations marked as
-# ignore-failure.
-gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/different-pixels-ignore-some-failures.json" "$GM_OUTPUTS/ignoring-some-failures"
-
-# Compare generated image against an empty "expected image" dir.
-# Even the tests that have been marked as ignore-failure (selftest1) should
-# show up as no-comparison.
-gm_test "--verbose --hierarchy --match selftest --ignoreFailuresFile $GM_IGNORE_FAILURES_FILE $CONFIGS -r $GM_INPUTS/images/empty-dir" "$GM_OUTPUTS/compared-against-empty-dir"
-
-# Compare generated image against a nonexistent "expected image" dir.
-gm_test "--verbose --hierarchy --match selftest1 $CONFIGS -r ../path/to/nowhere" "$GM_OUTPUTS/compared-against-nonexistent-dir"
-
-# Compare generated image against an empty "expected image" dir, but NOT in verbose mode.
-gm_test "--hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/images/empty-dir" "$GM_OUTPUTS/nonverbose"
-
-# Add pdf to the list of configs.
-gm_test "--verbose --hierarchy --match selftest1 $CONFIGS pdf -r $GM_INPUTS/json/identical-bytes.json" "$GM_OUTPUTS/add-config-pdf"
-
-# Test what happens if run without -r (no expected-results.json to compare
-# against).
-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"
-
-# Confirm that IntentionallySkipped tests are recorded as such.
-gm_test "--verbose --hierarchy --match selftest1 selftest2 $CONFIGS" "$GM_OUTPUTS/intentionally-skipped-tests"
-
-# Ignore some error types (including ExpectationsMismatch)
-gm_test "--ignoreErrorTypes ExpectationsMismatch NoGpuContext --verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/different-pixels.json" "$GM_OUTPUTS/ignore-expectations-mismatch"
-
-# Test non-hierarchical mode.
-gm_test "--verbose --match selftest1 $CONFIGS -r $GM_INPUTS/json/different-pixels-no-hierarchy.json" "$GM_OUTPUTS/no-hierarchy"
-
-# Try writing out actual images using checksum-based filenames, like we do when
-# uploading to Google Storage.
-gm_test "--verbose --writeChecksumBasedFilenames --match selftest1 $CONFIGS -r $GM_INPUTS/json/different-pixels-no-hierarchy.json" "$GM_OUTPUTS/checksum-based-filenames"
-
-# Exercise display_json_results.py
-PASSING_CASES="compared-against-identical-bytes-json compared-against-identical-pixels-json"
-FAILING_CASES="compared-against-different-pixels-json"
-for CASE in $PASSING_CASES; do
- assert_passes "python gm/display_json_results.py $GM_OUTPUTS/$CASE/$OUTPUT_EXPECTED_SUBDIR/json-summary.txt"
-done
-for CASE in $FAILING_CASES; do
- assert_fails "python gm/display_json_results.py $GM_OUTPUTS/$CASE/$OUTPUT_EXPECTED_SUBDIR/json-summary.txt"
-done
-
-# Exercise all Python unittests.
-assert_passes "python gm/test_all.py"
-
-echo
-if [ $ENCOUNTERED_ANY_ERRORS == 0 ]; then
- echo "All tests passed."
- exit 0
-else
- echo "Some tests failed."
- exit 1
-fi