skdiff: recurse over subdirectories, unless --norecurse option is given

in anticipation of https://code.google.com/p/skia/issues/detail?id=743 ('move gm baselines outside of trunk, and modify naming convention')
Review URL: https://codereview.appspot.com/6465053

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

27 files changed, 24 insertions, 24 deletions

diff --git a/tools/tests/skdiff/baseDir/different-bits-identical-pixels.png b/tools/tests/skdiff/baseDir/different-bits/different-bits-identical-pixels.png
index e141b275f3..e141b275f3 100644
--- a/tools/tests/skdiff/baseDir/different-bits-identical-pixels.png
+++ b/tools/tests/skdiff/baseDir/different-bits/different-bits-identical-pixels.png
diff --git a/tools/tests/skdiff/baseDir/different-bits-unknown-format.xyz b/tools/tests/skdiff/baseDir/different-bits/different-bits-unknown-format.xyz
index 5862bdeac7..5862bdeac7 100644
--- a/tools/tests/skdiff/baseDir/different-bits-unknown-format.xyz
+++ b/tools/tests/skdiff/baseDir/different-bits/different-bits-unknown-format.xyz
diff --git a/tools/tests/skdiff/baseDir/slightly-different-pixels-same-size.png b/tools/tests/skdiff/baseDir/different-bits/slightly-different-pixels-same-size.png
index e141b275f3..e141b275f3 100644
--- a/tools/tests/skdiff/baseDir/slightly-different-pixels-same-size.png
+++ b/tools/tests/skdiff/baseDir/different-bits/slightly-different-pixels-same-size.png
diff --git a/tools/tests/skdiff/baseDir/slightly-different-sizes.png b/tools/tests/skdiff/baseDir/different-bits/slightly-different-sizes.png
index e141b275f3..e141b275f3 100644
--- a/tools/tests/skdiff/baseDir/slightly-different-sizes.png
+++ b/tools/tests/skdiff/baseDir/different-bits/slightly-different-sizes.png
diff --git a/tools/tests/skdiff/baseDir/very-different-pixels-same-size.png b/tools/tests/skdiff/baseDir/different-bits/very-different-pixels-same-size.png
index e141b275f3..e141b275f3 100644
--- a/tools/tests/skdiff/baseDir/very-different-pixels-same-size.png
+++ b/tools/tests/skdiff/baseDir/different-bits/very-different-pixels-same-size.png
diff --git a/tools/tests/skdiff/baseDir/very-different-sizes.png b/tools/tests/skdiff/baseDir/different-bits/very-different-sizes.png
index e141b275f3..e141b275f3 100644
--- a/tools/tests/skdiff/baseDir/very-different-sizes.png
+++ b/tools/tests/skdiff/baseDir/different-bits/very-different-sizes.png
diff --git a/tools/tests/skdiff/baseDir/identical-bits-unknown-format.xyz b/tools/tests/skdiff/baseDir/identical-bits/identical-bits-unknown-format.xyz
index 319d3a995a..319d3a995a 100644
--- a/tools/tests/skdiff/baseDir/identical-bits-unknown-format.xyz
+++ b/tools/tests/skdiff/baseDir/identical-bits/identical-bits-unknown-format.xyz
diff --git a/tools/tests/skdiff/baseDir/identical-bits.png b/tools/tests/skdiff/baseDir/identical-bits/identical-bits.png
index e141b275f3..e141b275f3 100644
--- a/tools/tests/skdiff/baseDir/identical-bits.png
+++ b/tools/tests/skdiff/baseDir/identical-bits/identical-bits.png
diff --git a/tools/tests/skdiff/baseDir/missing-from-comparisonDir.png b/tools/tests/skdiff/baseDir/missing-files/missing-from-comparisonDir.png
index e141b275f3..e141b275f3 100644
--- a/tools/tests/skdiff/baseDir/missing-from-comparisonDir.png
+++ b/tools/tests/skdiff/baseDir/missing-files/missing-from-comparisonDir.png
diff --git a/tools/tests/skdiff/baseDir/missing-from-comparisonDir.xyz b/tools/tests/skdiff/baseDir/missing-files/missing-from-comparisonDir.xyz
index 06271f1451..06271f1451 100644
--- a/tools/tests/skdiff/baseDir/missing-from-comparisonDir.xyz
+++ b/tools/tests/skdiff/baseDir/missing-files/missing-from-comparisonDir.xyz
diff --git a/tools/tests/skdiff/comparisonDir/different-bits-identical-pixels.png b/tools/tests/skdiff/comparisonDir/different-bits/different-bits-identical-pixels.png
index a35db84fc7..a35db84fc7 100644
--- a/tools/tests/skdiff/comparisonDir/different-bits-identical-pixels.png
+++ b/tools/tests/skdiff/comparisonDir/different-bits/different-bits-identical-pixels.png
diff --git a/tools/tests/skdiff/comparisonDir/different-bits-unknown-format.xyz b/tools/tests/skdiff/comparisonDir/different-bits/different-bits-unknown-format.xyz
index 6da08dfaa1..6da08dfaa1 100644
--- a/tools/tests/skdiff/comparisonDir/different-bits-unknown-format.xyz
+++ b/tools/tests/skdiff/comparisonDir/different-bits/different-bits-unknown-format.xyz
diff --git a/tools/tests/skdiff/comparisonDir/slightly-different-pixels-same-size.png b/tools/tests/skdiff/comparisonDir/different-bits/slightly-different-pixels-same-size.png
index 3d59d90953..3d59d90953 100644
--- a/tools/tests/skdiff/comparisonDir/slightly-different-pixels-same-size.png
+++ b/tools/tests/skdiff/comparisonDir/different-bits/slightly-different-pixels-same-size.png
diff --git a/tools/tests/skdiff/comparisonDir/slightly-different-sizes.png b/tools/tests/skdiff/comparisonDir/different-bits/slightly-different-sizes.png
index 7c9dd07b5a..7c9dd07b5a 100644
--- a/tools/tests/skdiff/comparisonDir/slightly-different-sizes.png
+++ b/tools/tests/skdiff/comparisonDir/different-bits/slightly-different-sizes.png
diff --git a/tools/tests/skdiff/comparisonDir/very-different-pixels-same-size.png b/tools/tests/skdiff/comparisonDir/different-bits/very-different-pixels-same-size.png
index 5cbdeba0da..5cbdeba0da 100644
--- a/tools/tests/skdiff/comparisonDir/very-different-pixels-same-size.png
+++ b/tools/tests/skdiff/comparisonDir/different-bits/very-different-pixels-same-size.png
diff --git a/tools/tests/skdiff/comparisonDir/very-different-sizes.png b/tools/tests/skdiff/comparisonDir/different-bits/very-different-sizes.png
index 92797b45f1..92797b45f1 100644
--- a/tools/tests/skdiff/comparisonDir/very-different-sizes.png
+++ b/tools/tests/skdiff/comparisonDir/different-bits/very-different-sizes.png
diff --git a/tools/tests/skdiff/comparisonDir/identical-bits-unknown-format.xyz b/tools/tests/skdiff/comparisonDir/identical-bits/identical-bits-unknown-format.xyz
index 319d3a995a..319d3a995a 100644
--- a/tools/tests/skdiff/comparisonDir/identical-bits-unknown-format.xyz
+++ b/tools/tests/skdiff/comparisonDir/identical-bits/identical-bits-unknown-format.xyz
diff --git a/tools/tests/skdiff/comparisonDir/identical-bits.png b/tools/tests/skdiff/comparisonDir/identical-bits/identical-bits.png
index e141b275f3..e141b275f3 100644
--- a/tools/tests/skdiff/comparisonDir/identical-bits.png
+++ b/tools/tests/skdiff/comparisonDir/identical-bits/identical-bits.png
diff --git a/tools/tests/skdiff/comparisonDir/missing-from-baseDir.png b/tools/tests/skdiff/comparisonDir/missing-files/missing-from-baseDir.png
index e141b275f3..e141b275f3 100644
--- a/tools/tests/skdiff/comparisonDir/missing-from-baseDir.png
+++ b/tools/tests/skdiff/comparisonDir/missing-files/missing-from-baseDir.png
diff --git a/tools/tests/skdiff/comparisonDir/missing-from-baseDir.xyz b/tools/tests/skdiff/comparisonDir/missing-files/missing-from-baseDir.xyz
index 001e06a59c..001e06a59c 100644
--- a/tools/tests/skdiff/comparisonDir/missing-from-baseDir.xyz
+++ b/tools/tests/skdiff/comparisonDir/missing-files/missing-from-baseDir.xyz
diff --git a/tools/tests/skdiff/test1/output-expected/slightly-different-pixels-same-size-diff.png b/tools/tests/skdiff/test1/output-expected/different-bits_slightly-different-pixels-same-size-diff.png
index 479a4e56a4..479a4e56a4 100644
--- a/tools/tests/skdiff/test1/output-expected/slightly-different-pixels-same-size-diff.png
+++ b/tools/tests/skdiff/test1/output-expected/different-bits_slightly-different-pixels-same-size-diff.png
diff --git a/tools/tests/skdiff/test1/output-expected/slightly-different-pixels-same-size-white.png b/tools/tests/skdiff/test1/output-expected/different-bits_slightly-different-pixels-same-size-white.png
index 738406eab4..738406eab4 100644
--- a/tools/tests/skdiff/test1/output-expected/slightly-different-pixels-same-size-white.png
+++ b/tools/tests/skdiff/test1/output-expected/different-bits_slightly-different-pixels-same-size-white.png
diff --git a/tools/tests/skdiff/test1/output-expected/very-different-pixels-same-size-diff.png b/tools/tests/skdiff/test1/output-expected/different-bits_very-different-pixels-same-size-diff.png
index dbd706349d..dbd706349d 100644
--- a/tools/tests/skdiff/test1/output-expected/very-different-pixels-same-size-diff.png
+++ b/tools/tests/skdiff/test1/output-expected/different-bits_very-different-pixels-same-size-diff.png
diff --git a/tools/tests/skdiff/test1/output-expected/very-different-pixels-same-size-white.png b/tools/tests/skdiff/test1/output-expected/different-bits_very-different-pixels-same-size-white.png
index 10d8c55a56..10d8c55a56 100644
--- a/tools/tests/skdiff/test1/output-expected/very-different-pixels-same-size-white.png
+++ b/tools/tests/skdiff/test1/output-expected/different-bits_very-different-pixels-same-size-white.png
diff --git a/tools/tests/skdiff/test1/output-expected/index.html b/tools/tests/skdiff/test1/output-expected/index.html
index 88b64edc17..e749620bc6 100644
--- a/tools/tests/skdiff/test1/output-expected/index.html
+++ b/tools/tests/skdiff/test1/output-expected/index.html
@@ -8,25 +8,25 @@
 <th>comparisonDir: tools/tests/skdiff/comparisonDir/</th>
 </tr>
 <tr>
-<td><b>missing-from-baseDir.png</b><br>Missing from baseDir</td><td>N/A</td><td>N/A</td><td>N/A</td><td><a href="../../../../../tools/tests/skdiff/comparisonDir/missing-from-baseDir.png"><img src="../../../../../tools/tests/skdiff/comparisonDir/missing-from-baseDir.png" height="240px"></a></td></tr>
+<td><b>missing-files/missing-from-baseDir.png</b><br>Missing from baseDir</td><td>N/A</td><td>N/A</td><td>N/A</td><td><a href="../../../../../tools/tests/skdiff/comparisonDir/missing-files/missing-from-baseDir.png"><img src="../../../../../tools/tests/skdiff/comparisonDir/missing-files/missing-from-baseDir.png" height="240px"></a></td></tr>
 <tr>
-<td><b>missing-from-baseDir.xyz</b><br>Missing from baseDir</td><td>N/A</td><td>N/A</td><td>N/A</td><td>N/A</td></tr>
+<td><b>missing-files/missing-from-baseDir.xyz</b><br>Missing from baseDir</td><td>N/A</td><td>N/A</td><td>N/A</td><td>N/A</td></tr>
 <tr>
-<td><b>missing-from-comparisonDir.png</b><br>Missing from comparisonDir</td><td>N/A</td><td>N/A</td><td><a href="../../../../../tools/tests/skdiff/baseDir/missing-from-comparisonDir.png"><img src="../../../../../tools/tests/skdiff/baseDir/missing-from-comparisonDir.png" height="240px"></a></td><td>N/A</td></tr>
+<td><b>missing-files/missing-from-comparisonDir.png</b><br>Missing from comparisonDir</td><td>N/A</td><td>N/A</td><td><a href="../../../../../tools/tests/skdiff/baseDir/missing-files/missing-from-comparisonDir.png"><img src="../../../../../tools/tests/skdiff/baseDir/missing-files/missing-from-comparisonDir.png" height="240px"></a></td><td>N/A</td></tr>
 <tr>
-<td><b>missing-from-comparisonDir.xyz</b><br>Missing from comparisonDir</td><td>N/A</td><td>N/A</td><td>N/A</td><td>N/A</td></tr>
+<td><b>missing-files/missing-from-comparisonDir.xyz</b><br>Missing from comparisonDir</td><td>N/A</td><td>N/A</td><td>N/A</td><td>N/A</td></tr>
 <tr>
-<td><b>different-bits-unknown-format.xyz</b><br>Files differ; unable to parse one or both files</td><td>N/A</td><td>N/A</td><td>N/A</td><td>N/A</td></tr>
+<td><b>different-bits/different-bits-unknown-format.xyz</b><br>Files differ; unable to parse one or both files</td><td>N/A</td><td>N/A</td><td>N/A</td><td>N/A</td></tr>
 <tr>
-<td><b>slightly-different-sizes.png</b><br>Image sizes differ</td><td>N/A</td><td>N/A</td><td><a href="../../../../../tools/tests/skdiff/baseDir/slightly-different-sizes.png"><img src="../../../../../tools/tests/skdiff/baseDir/slightly-different-sizes.png" height="240px"></a></td><td><a href="../../../../../tools/tests/skdiff/comparisonDir/slightly-different-sizes.png"><img src="../../../../../tools/tests/skdiff/comparisonDir/slightly-different-sizes.png" height="240px"></a></td></tr>
+<td><b>different-bits/slightly-different-sizes.png</b><br>Image sizes differ</td><td>N/A</td><td>N/A</td><td><a href="../../../../../tools/tests/skdiff/baseDir/different-bits/slightly-different-sizes.png"><img src="../../../../../tools/tests/skdiff/baseDir/different-bits/slightly-different-sizes.png" height="240px"></a></td><td><a href="../../../../../tools/tests/skdiff/comparisonDir/different-bits/slightly-different-sizes.png"><img src="../../../../../tools/tests/skdiff/comparisonDir/different-bits/slightly-different-sizes.png" height="240px"></a></td></tr>
 <tr>
-<td><b>very-different-sizes.png</b><br>Image sizes differ</td><td>N/A</td><td>N/A</td><td><a href="../../../../../tools/tests/skdiff/baseDir/very-different-sizes.png"><img src="../../../../../tools/tests/skdiff/baseDir/very-different-sizes.png" height="240px"></a></td><td><a href="../../../../../tools/tests/skdiff/comparisonDir/very-different-sizes.png"><img src="../../../../../tools/tests/skdiff/comparisonDir/very-different-sizes.png" height="128px"></a></td></tr>
+<td><b>different-bits/very-different-sizes.png</b><br>Image sizes differ</td><td>N/A</td><td>N/A</td><td><a href="../../../../../tools/tests/skdiff/baseDir/different-bits/very-different-sizes.png"><img src="../../../../../tools/tests/skdiff/baseDir/different-bits/very-different-sizes.png" height="240px"></a></td><td><a href="../../../../../tools/tests/skdiff/comparisonDir/different-bits/very-different-sizes.png"><img src="../../../../../tools/tests/skdiff/comparisonDir/different-bits/very-different-sizes.png" height="128px"></a></td></tr>
 <tr>
-<td><b>very-different-pixels-same-size.png</b><br>     97.9926% of pixels differ
-  (     42.8911% weighted)<br>Average color mismatch 89<br>Max color mismatch 239</td><td><a href="very-different-pixels-same-size-white.png"><img src="very-different-pixels-same-size-white.png" height="240px"></a></td><td><a href="very-different-pixels-same-size-diff.png"><img src="very-different-pixels-same-size-diff.png" height="240px"></a></td><td><a href="../../../../../tools/tests/skdiff/baseDir/very-different-pixels-same-size.png"><img src="../../../../../tools/tests/skdiff/baseDir/very-different-pixels-same-size.png" height="240px"></a></td><td><a href="../../../../../tools/tests/skdiff/comparisonDir/very-different-pixels-same-size.png"><img src="../../../../../tools/tests/skdiff/comparisonDir/very-different-pixels-same-size.png" height="240px"></a></td></tr>
+<td><b>different-bits/very-different-pixels-same-size.png</b><br>     97.9926% of pixels differ
+  (     42.8911% weighted)<br>Average color mismatch 89<br>Max color mismatch 239</td><td><a href="different-bits_very-different-pixels-same-size-white.png"><img src="different-bits_very-different-pixels-same-size-white.png" height="240px"></a></td><td><a href="different-bits_very-different-pixels-same-size-diff.png"><img src="different-bits_very-different-pixels-same-size-diff.png" height="240px"></a></td><td><a href="../../../../../tools/tests/skdiff/baseDir/different-bits/very-different-pixels-same-size.png"><img src="../../../../../tools/tests/skdiff/baseDir/different-bits/very-different-pixels-same-size.png" height="240px"></a></td><td><a href="../../../../../tools/tests/skdiff/comparisonDir/different-bits/very-different-pixels-same-size.png"><img src="../../../../../tools/tests/skdiff/comparisonDir/different-bits/very-different-pixels-same-size.png" height="240px"></a></td></tr>
 <tr>
-<td><b>slightly-different-pixels-same-size.png</b><br>      0.6630% of pixels differ
-  (      0.1904% weighted)<br>(2164 pixels)<br>Average color mismatch 0<br>Max color mismatch 213</td><td><a href="slightly-different-pixels-same-size-white.png"><img src="slightly-different-pixels-same-size-white.png" height="240px"></a></td><td><a href="slightly-different-pixels-same-size-diff.png"><img src="slightly-different-pixels-same-size-diff.png" height="240px"></a></td><td><a href="../../../../../tools/tests/skdiff/baseDir/slightly-different-pixels-same-size.png"><img src="../../../../../tools/tests/skdiff/baseDir/slightly-different-pixels-same-size.png" height="240px"></a></td><td><a href="../../../../../tools/tests/skdiff/comparisonDir/slightly-different-pixels-same-size.png"><img src="../../../../../tools/tests/skdiff/comparisonDir/slightly-different-pixels-same-size.png" height="240px"></a></td></tr>
+<td><b>different-bits/slightly-different-pixels-same-size.png</b><br>      0.6630% of pixels differ
+  (      0.1904% weighted)<br>(2164 pixels)<br>Average color mismatch 0<br>Max color mismatch 213</td><td><a href="different-bits_slightly-different-pixels-same-size-white.png"><img src="different-bits_slightly-different-pixels-same-size-white.png" height="240px"></a></td><td><a href="different-bits_slightly-different-pixels-same-size-diff.png"><img src="different-bits_slightly-different-pixels-same-size-diff.png" height="240px"></a></td><td><a href="../../../../../tools/tests/skdiff/baseDir/different-bits/slightly-different-pixels-same-size.png"><img src="../../../../../tools/tests/skdiff/baseDir/different-bits/slightly-different-pixels-same-size.png" height="240px"></a></td><td><a href="../../../../../tools/tests/skdiff/comparisonDir/different-bits/slightly-different-pixels-same-size.png"><img src="../../../../../tools/tests/skdiff/comparisonDir/different-bits/slightly-different-pixels-same-size.png" height="240px"></a></td></tr>
 </table>
 </body>
 </html>
diff --git a/tools/tests/skdiff/test1/output-expected/stdout b/tools/tests/skdiff/test1/output-expected/stdout
index 3cc7f6fc84..3208fc4b56 100644
--- a/tools/tests/skdiff/test1/output-expected/stdout
+++ b/tools/tests/skdiff/test1/output-expected/stdout
@@ -1,8 +1,8 @@
-ERROR: no codec found for basePath <tools/tests/skdiff/baseDir/different-bits-unknown-format.xyz>
-ERROR: no codec found for <tools/tests/skdiff/comparisonDir/missing-from-baseDir.xyz>
-ERROR: no codec found for <tools/tests/skdiff/baseDir/missing-from-comparisonDir.xyz>
-ERROR: no codec found for <tools/tests/skdiff/baseDir/different-bits-unknown-format.xyz>
-ERROR: no codec found for <tools/tests/skdiff/comparisonDir/different-bits-unknown-format.xyz>
+ERROR: no codec found for basePath <tools/tests/skdiff/baseDir/different-bits/different-bits-unknown-format.xyz>
+ERROR: no codec found for <tools/tests/skdiff/comparisonDir/missing-files/missing-from-baseDir.xyz>
+ERROR: no codec found for <tools/tests/skdiff/baseDir/missing-files/missing-from-comparisonDir.xyz>
+ERROR: no codec found for <tools/tests/skdiff/baseDir/different-bits/different-bits-unknown-format.xyz>
+ERROR: no codec found for <tools/tests/skdiff/comparisonDir/different-bits/different-bits-unknown-format.xyz>
 baseDir is [tools/tests/skdiff/baseDir/]
 comparisonDir is [tools/tests/skdiff/comparisonDir/]
 writing diffs to outputDir is [tools/tests/skdiff/test1/output-actual/]
diff --git a/tools/tests/skdiff/test2/output-expected/stdout b/tools/tests/skdiff/test2/output-expected/stdout
index 09c4ea1ae0..ef198e78cf 100644
--- a/tools/tests/skdiff/test2/output-expected/stdout
+++ b/tools/tests/skdiff/test2/output-expected/stdout
@@ -1,16 +1,16 @@
-ERROR: no codec found for basePath <tools/tests/skdiff/baseDir/different-bits-unknown-format.xyz>
+ERROR: no codec found for basePath <tools/tests/skdiff/baseDir/different-bits/different-bits-unknown-format.xyz>
 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/identical-bits-unknown-format.xyz identical-bits/identical-bits.png 
+[_] 1 file pairs contain the same pixel values, but not the same bits: different-bits/different-bits-identical-pixels.png 
+[*] 2 file pairs have identical dimensions but some differing pixels: different-bits/slightly-different-pixels-same-size.png different-bits/very-different-pixels-same-size.png 
+[*] 2 file pairs have differing dimensions: different-bits/slightly-different-sizes.png different-bits/very-different-sizes.png 
+[*] 1 file pairs contain different bits and are not parsable images: different-bits/different-bits-unknown-format.xyz 
+[_] 2 file pairs missing from comparisonDir: missing-files/missing-from-comparisonDir.png missing-files/missing-from-comparisonDir.xyz 
+[_] 2 file pairs missing from baseDir: missing-files/missing-from-baseDir.png missing-files/missing-from-baseDir.xyz 
 [*] 0 file pairs not compared yet: 
 (results marked with [*] will cause nonzero return value)