skdiff output: indicate which result types would cause failure

Review URL: https://codereview.appspot.com/6419053

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

4 files changed, 48 insertions, 17 deletions

diff --git a/tools/tests/skdiff/identical-bits-or-pixels/output-expected/stdout b/tools/tests/skdiff/identical-bits-or-pixels/output-expected/stdout
index c5d12ec3da..38575a5769 100644
--- a/tools/tests/skdiff/identical-bits-or-pixels/output-expected/stdout
+++ b/tools/tests/skdiff/identical-bits-or-pixels/output-expected/stdout
@@ -1,6 +1,16 @@
 baseDir is [tools/tests/skdiff/baseDir/]
 comparisonDir is [tools/tests/skdiff/comparisonDir/]
 not writing any diffs to outputDir [tools/tests/skdiff/identical-bits-or-pixels/output-actual/]
+
 compared 3 file pairs:
- 2 file pairs contain exactly the same bits
- 1 file pairs contain the same pixel values, but not the same bits
+[_] 2 file pairs contain exactly the same bits
+[_] 1 file pairs contain the same pixel values, but not the same bits
+[_] 0 file pairs have identical dimensions but some differing pixels
+[_] 0 file pairs have differing dimensions
+[_] 0 file pairs contain different bits and are not parsable images
+[_] 0 file pairs missing from comparisonDir
+[_] 0 file pairs missing from baseDir
+[_] 0 file pairs not compared yet
+(results marked with [*] will cause nonzero return value)
+
+number of mismatching file pairs: 0
diff --git a/tools/tests/skdiff/identical-bits/output-expected/stdout b/tools/tests/skdiff/identical-bits/output-expected/stdout
index c40ae334c9..8e27568b33 100644
--- a/tools/tests/skdiff/identical-bits/output-expected/stdout
+++ b/tools/tests/skdiff/identical-bits/output-expected/stdout
@@ -1,5 +1,16 @@
 baseDir is [tools/tests/skdiff/baseDir/]
 comparisonDir is [tools/tests/skdiff/comparisonDir/]
 not writing any diffs to outputDir [tools/tests/skdiff/identical-bits/output-actual/]
+
 compared 2 file pairs:
- 2 file pairs contain exactly the same bits
+[_] 2 file pairs contain exactly the same bits
+[_] 0 file pairs contain the same pixel values, but not the same bits
+[_] 0 file pairs have identical dimensions but some differing pixels
+[_] 0 file pairs have differing dimensions
+[_] 0 file pairs contain different bits and are not parsable images
+[_] 0 file pairs missing from comparisonDir
+[_] 0 file pairs missing from baseDir
+[_] 0 file pairs not compared yet
+(results marked with [*] will cause nonzero return value)
+
+number of mismatching file pairs: 0
diff --git a/tools/tests/skdiff/test1/output-expected/stdout b/tools/tests/skdiff/test1/output-expected/stdout
index 142093f1dd..3cc7f6fc84 100644
--- a/tools/tests/skdiff/test1/output-expected/stdout
+++ b/tools/tests/skdiff/test1/output-expected/stdout
@@ -6,13 +6,18 @@ ERROR: no codec found for <tools/tests/skdiff/comparisonDir/different-bits-unkno
 baseDir is [tools/tests/skdiff/baseDir/]
 comparisonDir is [tools/tests/skdiff/comparisonDir/]
 writing diffs to outputDir is [tools/tests/skdiff/test1/output-actual/]
+
 compared 12 file pairs:
- 2 file pairs contain exactly the same bits
- 1 file pairs contain the same pixel values, but not the same bits
- 2 file pairs have identical dimensions but some differing pixels
- 2 file pairs have differing dimensions
- 1 file pairs contain different bits and are not parsable images
- 2 file pairs missing from comparisonDir
- 2 file pairs missing from baseDir
+[_] 2 file pairs contain exactly the same bits
+[_] 1 file pairs contain the same pixel values, but not the same bits
+[_] 2 file pairs have identical dimensions but some differing pixels
+[_] 2 file pairs have differing dimensions
+[_] 1 file pairs contain different bits and are not parsable images
+[_] 2 file pairs missing from comparisonDir
+[_] 2 file pairs missing from baseDir
+[_] 0 file pairs not compared yet
+(results marked with [*] will cause nonzero return value)
+
+number of mismatching file pairs: 9
 Maximum pixel intensity mismatch 239
 Largest area mismatch was 97.99% of pixels
diff --git a/tools/tests/skdiff/test2/output-expected/stdout b/tools/tests/skdiff/test2/output-expected/stdout
index 855deaee6e..09c4ea1ae0 100644
--- a/tools/tests/skdiff/test2/output-expected/stdout
+++ b/tools/tests/skdiff/test2/output-expected/stdout
@@ -2,13 +2,18 @@ ERROR: no codec found for basePath <tools/tests/skdiff/baseDir/different-bits-un
 baseDir is [tools/tests/skdiff/baseDir/]
 comparisonDir is [tools/tests/skdiff/comparisonDir/]
 not writing any diffs to outputDir [tools/tests/skdiff/test2/output-actual/]
+
 compared 12 file pairs:
- 2 file pairs contain exactly the same bits: identical-bits-unknown-format.xyz identical-bits.png 
- 1 file pairs contain the same pixel values, but not the same bits: different-bits-identical-pixels.png 
- 2 file pairs have identical dimensions but some differing pixels: slightly-different-pixels-same-size.png very-different-pixels-same-size.png 
- 2 file pairs have differing dimensions: slightly-different-sizes.png very-different-sizes.png 
- 1 file pairs contain different bits and are not parsable images: different-bits-unknown-format.xyz 
- 2 file pairs missing from comparisonDir: missing-from-comparisonDir.png missing-from-comparisonDir.xyz 
- 2 file pairs missing from baseDir: missing-from-baseDir.png missing-from-baseDir.xyz 
+[_] 2 file pairs contain exactly the same bits: identical-bits-unknown-format.xyz identical-bits.png 
+[_] 1 file pairs contain the same pixel values, but not the same bits: different-bits-identical-pixels.png 
+[*] 2 file pairs have identical dimensions but some differing pixels: slightly-different-pixels-same-size.png very-different-pixels-same-size.png 
+[*] 2 file pairs have differing dimensions: slightly-different-sizes.png very-different-sizes.png 
+[*] 1 file pairs contain different bits and are not parsable images: different-bits-unknown-format.xyz 
+[_] 2 file pairs missing from comparisonDir: missing-from-comparisonDir.png missing-from-comparisonDir.xyz 
+[_] 2 file pairs missing from baseDir: missing-from-baseDir.png missing-from-baseDir.xyz 
+[*] 0 file pairs not compared yet: 
+(results marked with [*] will cause nonzero return value)
+
+number of mismatching file pairs: 9
 Maximum pixel intensity mismatch 239
 Largest area mismatch was 97.99% of pixels