From be6188d64721850723c19d5a7a4f007a675300f4 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 31 May 2012 15:13:45 +0000 Subject: [PATCH] skdiff: return nonzero exit value if there are any mismatches This will allow us to replace "gm -r" in our buildbots with "skdiff". This will speed things up, and work around http://code.google.com/p/skia/issues/detail?id=473 ('PDF gradtext gm image results are nondeterministic') Review URL: https://codereview.appspot.com/6242071 git-svn-id: http://skia.googlecode.com/svn/trunk@4097 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools/skdiff_main.cpp | 4 ++++ tools/tests/skdiff/test1/output-expected/return_value | 2 +- tools/tests/skdiff/test2/output-expected/return_value | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/skdiff_main.cpp b/tools/skdiff_main.cpp index 3dd46a1961..30ecfa42e9 100644 --- a/tools/skdiff_main.cpp +++ b/tools/skdiff_main.cpp @@ -27,6 +27,8 @@ * Creates an index.html in the current third directory to compare each * pair that does not match exactly. * Does *not* recursively descend directories. + * + * Returns zero exit code if all images match across baseDir and comparisonDir. */ #if SK_BUILD_FOR_WIN32 @@ -1170,4 +1172,6 @@ int main (int argc, char ** argv) { } matchSubstrings.deleteAll(); nomatchSubstrings.deleteAll(); + + return summary.fNumMismatches; } diff --git a/tools/tests/skdiff/test1/output-expected/return_value b/tools/tests/skdiff/test1/output-expected/return_value index 573541ac97..ec635144f6 100644 --- a/tools/tests/skdiff/test1/output-expected/return_value +++ b/tools/tests/skdiff/test1/output-expected/return_value @@ -1 +1 @@ -0 +9 diff --git a/tools/tests/skdiff/test2/output-expected/return_value b/tools/tests/skdiff/test2/output-expected/return_value index 573541ac97..ec635144f6 100644 --- a/tools/tests/skdiff/test2/output-expected/return_value +++ b/tools/tests/skdiff/test2/output-expected/return_value @@ -1 +1 @@ -0 +9