From e8d08a0fc294f2df7fc1ea074bcad52fc57c91b4 Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 8 May 2013 15:22:36 +0000 Subject: Roll out r9059 to unbreak bots git-svn-id: http://skia.googlecode.com/svn/trunk@9060 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm/gm_expectations.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gm') diff --git a/gm/gm_expectations.cpp b/gm/gm_expectations.cpp index 72fb0e6a8d..16e655ed43 100644 --- a/gm/gm_expectations.cpp +++ b/gm/gm_expectations.cpp @@ -16,10 +16,18 @@ const static char kJsonKey_ActualResults_Failed[] = "failed"; const static char kJsonKey_ActualResults_FailureIgnored[]= "failure-ignored"; const static char kJsonKey_ActualResults_NoComparison[] = "no-comparison"; const static char kJsonKey_ActualResults_Succeeded[] = "succeeded"; +#ifdef BITMAPHASHER_USES_TRUNCATED_MD5 const static char kJsonKey_ActualResults_AnyStatus_BitmapHash[] = "bitmap-64bitMD5"; +#else +const static char kJsonKey_ActualResults_AnyStatus_BitmapHash[] = "bitmap-cityhash"; +#endif const static char kJsonKey_ExpectedResults[] = "expected-results"; +#ifdef BITMAPHASHER_USES_TRUNCATED_MD5 const static char kJsonKey_ExpectedResults_AllowedBitmapHashes[] = "allowed-bitmap-64bitMD5s"; +#else +const static char kJsonKey_ExpectedResults_AllowedBitmapHashes[] = "allowed-bitmap-cityhashes"; +#endif const static char kJsonKey_ExpectedResults_IgnoreFailure[] = "ignore-failure"; namespace skiagm { -- cgit v1.2.3