diff options
16 files changed, 20 insertions, 5 deletions
diff --git a/tools/tests/skdiff/baseDir/missing-from-comparisonDir.xyz b/tools/tests/skdiff/baseDir/missing-from-comparisonDir.xyz new file mode 100644 index 0000000000..06271f1451 --- /dev/null +++ b/tools/tests/skdiff/baseDir/missing-from-comparisonDir.xyz @@ -0,0 +1 @@ +ppouow diff --git a/tools/tests/skdiff/baseDir/different-pixels-same-size.png b/tools/tests/skdiff/baseDir/slightly-different-pixels-same-size.png Binary files differindex e141b275f3..e141b275f3 100644 --- a/tools/tests/skdiff/baseDir/different-pixels-same-size.png +++ b/tools/tests/skdiff/baseDir/slightly-different-pixels-same-size.png diff --git a/tools/tests/skdiff/baseDir/different-sizes.png b/tools/tests/skdiff/baseDir/slightly-different-sizes.png Binary files differindex e141b275f3..e141b275f3 100644 --- a/tools/tests/skdiff/baseDir/different-sizes.png +++ b/tools/tests/skdiff/baseDir/slightly-different-sizes.png diff --git a/tools/tests/skdiff/baseDir/very-different-pixels-same-size.png b/tools/tests/skdiff/baseDir/very-different-pixels-same-size.png Binary files differnew file mode 100644 index 0000000000..e141b275f3 --- /dev/null +++ b/tools/tests/skdiff/baseDir/very-different-pixels-same-size.png diff --git a/tools/tests/skdiff/baseDir/very-different-sizes.png b/tools/tests/skdiff/baseDir/very-different-sizes.png Binary files differnew file mode 100644 index 0000000000..e141b275f3 --- /dev/null +++ b/tools/tests/skdiff/baseDir/very-different-sizes.png diff --git a/tools/tests/skdiff/comparisonDir/missing-from-baseDir.xyz b/tools/tests/skdiff/comparisonDir/missing-from-baseDir.xyz new file mode 100644 index 0000000000..001e06a59c --- /dev/null +++ b/tools/tests/skdiff/comparisonDir/missing-from-baseDir.xyz @@ -0,0 +1 @@ +bblksdffff diff --git a/tools/tests/skdiff/comparisonDir/slightly-different-pixels-same-size.png b/tools/tests/skdiff/comparisonDir/slightly-different-pixels-same-size.png Binary files differnew file mode 100644 index 0000000000..3d59d90953 --- /dev/null +++ b/tools/tests/skdiff/comparisonDir/slightly-different-pixels-same-size.png diff --git a/tools/tests/skdiff/comparisonDir/different-sizes.png b/tools/tests/skdiff/comparisonDir/slightly-different-sizes.png Binary files differindex 7c9dd07b5a..7c9dd07b5a 100644 --- a/tools/tests/skdiff/comparisonDir/different-sizes.png +++ b/tools/tests/skdiff/comparisonDir/slightly-different-sizes.png diff --git a/tools/tests/skdiff/comparisonDir/different-pixels-same-size.png b/tools/tests/skdiff/comparisonDir/very-different-pixels-same-size.png Binary files differindex 5cbdeba0da..5cbdeba0da 100644 --- a/tools/tests/skdiff/comparisonDir/different-pixels-same-size.png +++ b/tools/tests/skdiff/comparisonDir/very-different-pixels-same-size.png diff --git a/tools/tests/skdiff/comparisonDir/very-different-sizes.png b/tools/tests/skdiff/comparisonDir/very-different-sizes.png Binary files differnew file mode 100644 index 0000000000..92797b45f1 --- /dev/null +++ b/tools/tests/skdiff/comparisonDir/very-different-sizes.png diff --git a/tools/tests/skdiff/output-expected/index.html b/tools/tests/skdiff/output-expected/index.html index 07ffc2f72f..be6ea77a08 100644 --- a/tools/tests/skdiff/output-expected/index.html +++ b/tools/tests/skdiff/output-expected/index.html @@ -1,21 +1,30 @@ <html> <body> <table> -<tr><th>4 of 8 images matched exactly.<br></th> +<tr><th>4 of 12 images matched exactly.<br></th> <th>every different pixel shown in white</th> <th>color difference at each pixel</th> <th>tools/tests/skdiff/baseDir/</th> <th>tools/tests/skdiff/comparisonDir/</th> </tr> <tr> -<td>different-sizes.png<br>Image sizes differ</td><td align=center>[image size mismatch, so no diff to display]</td><td align=center>[image size mismatch, so no diff to display]</td><td><a href="../../../../tools/tests/skdiff/baseDir/different-sizes.png"><img src="../../../../tools/tests/skdiff/baseDir/different-sizes.png" height="240px"></a></td><td><a href="../../../../tools/tests/skdiff/comparisonDir/different-sizes.png"><img src="../../../../tools/tests/skdiff/comparisonDir/different-sizes.png" height="240px"></a></td></tr> +<td>slightly-different-sizes.png<br>Image sizes differ</td><td align=center>[image size mismatch, so no diff to display]</td><td align=center>[image size mismatch, so no diff to display]</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> <tr> -<td>different-pixels-same-size.png<br> 97.9926% of pixels differ - ( 42.8911% weighted)<br>Average color mismatch 89<br>Max color mismatch 239</td><td><a href="different-pixels-same-size-white.png"><img src="different-pixels-same-size-white.png" height="240px"></a></td><td><a href="different-pixels-same-size-diff.png"><img src="different-pixels-same-size-diff.png" height="240px"></a></td><td><a href="../../../../tools/tests/skdiff/baseDir/different-pixels-same-size.png"><img src="../../../../tools/tests/skdiff/baseDir/different-pixels-same-size.png" height="240px"></a></td><td><a href="../../../../tools/tests/skdiff/comparisonDir/different-pixels-same-size.png"><img src="../../../../tools/tests/skdiff/comparisonDir/different-pixels-same-size.png" height="240px"></a></td></tr> +<td>very-different-sizes.png<br>Image sizes differ</td><td align=center>[image size mismatch, so no diff to display]</td><td align=center>[image size mismatch, so no diff to display]</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="240px"></a></td></tr> +<tr> +<td>very-different-pixels-same-size.png<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> +<tr> +<td>slightly-different-pixels-same-size.png<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> <tr> <td>missing-from-baseDir.png<br></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> <tr> +<td>missing-from-baseDir.xyz<br></td><td>N/A</td><td>N/A</td><td>N/A</td><td>N/A</td></tr> +<tr> <td>missing-from-comparisonDir.png<br></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> +<tr> +<td>missing-from-comparisonDir.xyz<br></td><td>N/A</td><td>N/A</td><td>N/A</td><td>N/A</td></tr> </table> </body> </html> diff --git a/tools/tests/skdiff/output-expected/slightly-different-pixels-same-size-diff.png b/tools/tests/skdiff/output-expected/slightly-different-pixels-same-size-diff.png Binary files differnew file mode 100644 index 0000000000..479a4e56a4 --- /dev/null +++ b/tools/tests/skdiff/output-expected/slightly-different-pixels-same-size-diff.png diff --git a/tools/tests/skdiff/output-expected/slightly-different-pixels-same-size-white.png b/tools/tests/skdiff/output-expected/slightly-different-pixels-same-size-white.png Binary files differnew file mode 100644 index 0000000000..738406eab4 --- /dev/null +++ b/tools/tests/skdiff/output-expected/slightly-different-pixels-same-size-white.png diff --git a/tools/tests/skdiff/output-expected/stdout b/tools/tests/skdiff/output-expected/stdout index 90abea3fc5..b0bd64117c 100644 --- a/tools/tests/skdiff/output-expected/stdout +++ b/tools/tests/skdiff/output-expected/stdout @@ -1,12 +1,16 @@ ERROR: no codec found for <tools/tests/skdiff/baseDir/different-bits-unknown-format.xyz> ERROR: no codec found for <tools/tests/skdiff/baseDir/identical-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> baseDir is [tools/tests/skdiff/baseDir/] comparisonDir is [tools/tests/skdiff/comparisonDir/] writing diffs to outputDir is [tools/tests/skdiff/output-actual/] Missing in baseDir: missing-from-baseDir.png + missing-from-baseDir.xyz Missing in comparisonDir: missing-from-comparisonDir.png -4 of 8 images matched. + missing-from-comparisonDir.xyz +4 of 12 images matched. Maximum pixel intensity mismatch 239 Largest area mismatch was 100.00% of pixels diff --git a/tools/tests/skdiff/output-expected/different-pixels-same-size-diff.png b/tools/tests/skdiff/output-expected/very-different-pixels-same-size-diff.png Binary files differindex dbd706349d..dbd706349d 100644 --- a/tools/tests/skdiff/output-expected/different-pixels-same-size-diff.png +++ b/tools/tests/skdiff/output-expected/very-different-pixels-same-size-diff.png diff --git a/tools/tests/skdiff/output-expected/different-pixels-same-size-white.png b/tools/tests/skdiff/output-expected/very-different-pixels-same-size-white.png Binary files differindex 10d8c55a56..10d8c55a56 100644 --- a/tools/tests/skdiff/output-expected/different-pixels-same-size-white.png +++ b/tools/tests/skdiff/output-expected/very-different-pixels-same-size-white.png |
