diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-08 15:22:36 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-08 15:22:36 +0000 |
| commit | e8d08a0fc294f2df7fc1ea074bcad52fc57c91b4 (patch) | |
| tree | 798f1a35f3e901da800762710f1d5c37bde03636 /gm | |
| parent | aaf7343e16c4bf9f9c6f07968689669fe6ba71d7 (diff) | |
Roll out r9059 to unbreak bots
git-svn-id: http://skia.googlecode.com/svn/trunk@9060 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/gm_expectations.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
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 { |