GM: now that we use MD5 instead of CityHash, the JSON should say so

(this should have been part of https://code.google.com/p/skia/source/detail?r=8992 )

R=bungeman@google.com

Review URL: https://codereview.chromium.org/14758003

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

12 files changed, 48 insertions, 48 deletions

diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt
index b8d43a37e3..1bc40b73bb 100644
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt
@@ -2,10 +2,10 @@
    "actual-results" : {
       "failed" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 12927999507540085554
+            "bitmap-64bitMD5" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 1209453360120438698
+            "bitmap-64bitMD5" : 1209453360120438698
          }
       },
       "failure-ignored" : null,
@@ -14,11 +14,11 @@
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 8863920166200910451 ],
+         "allowed-bitmap-64bitMD5s" : [ 8863920166200910451 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 13451349865803053525 ],
+         "allowed-bitmap-64bitMD5s" : [ 13451349865803053525 ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt
index b8d43a37e3..1bc40b73bb 100644
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt
@@ -2,10 +2,10 @@
    "actual-results" : {
       "failed" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 12927999507540085554
+            "bitmap-64bitMD5" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 1209453360120438698
+            "bitmap-64bitMD5" : 1209453360120438698
          }
       },
       "failure-ignored" : null,
@@ -14,11 +14,11 @@
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 8863920166200910451 ],
+         "allowed-bitmap-64bitMD5s" : [ 8863920166200910451 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 13451349865803053525 ],
+         "allowed-bitmap-64bitMD5s" : [ 13451349865803053525 ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt
index e55c38c5fa..c5edc8aff9 100644
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt
@@ -4,21 +4,21 @@
       "failure-ignored" : null,
       "no-comparison" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 12927999507540085554
+            "bitmap-64bitMD5" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 1209453360120438698
+            "bitmap-64bitMD5" : 1209453360120438698
          }
       },
       "succeeded" : null
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : null,
+         "allowed-bitmap-64bitMD5s" : null,
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : null,
+         "allowed-bitmap-64bitMD5s" : null,
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt
index e050124767..52256f435b 100644
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt
@@ -5,20 +5,20 @@
       "no-comparison" : null,
       "succeeded" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 12927999507540085554
+            "bitmap-64bitMD5" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 1209453360120438698
+            "bitmap-64bitMD5" : 1209453360120438698
          }
       }
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 12927999507540085554 ],
+         "allowed-bitmap-64bitMD5s" : [ 12927999507540085554 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 1209453360120438698 ],
+         "allowed-bitmap-64bitMD5s" : [ 1209453360120438698 ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt
index e050124767..52256f435b 100644
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt
@@ -5,20 +5,20 @@
       "no-comparison" : null,
       "succeeded" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 12927999507540085554
+            "bitmap-64bitMD5" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 1209453360120438698
+            "bitmap-64bitMD5" : 1209453360120438698
          }
       }
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 12927999507540085554 ],
+         "allowed-bitmap-64bitMD5s" : [ 12927999507540085554 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 1209453360120438698 ],
+         "allowed-bitmap-64bitMD5s" : [ 1209453360120438698 ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt
index e050124767..52256f435b 100644
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt
@@ -5,20 +5,20 @@
       "no-comparison" : null,
       "succeeded" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 12927999507540085554
+            "bitmap-64bitMD5" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 1209453360120438698
+            "bitmap-64bitMD5" : 1209453360120438698
          }
       }
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 12927999507540085554 ],
+         "allowed-bitmap-64bitMD5s" : [ 12927999507540085554 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 1209453360120438698 ],
+         "allowed-bitmap-64bitMD5s" : [ 1209453360120438698 ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt
index e050124767..52256f435b 100644
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt
@@ -5,20 +5,20 @@
       "no-comparison" : null,
       "succeeded" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 12927999507540085554
+            "bitmap-64bitMD5" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 1209453360120438698
+            "bitmap-64bitMD5" : 1209453360120438698
          }
       }
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 12927999507540085554 ],
+         "allowed-bitmap-64bitMD5s" : [ 12927999507540085554 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 1209453360120438698 ],
+         "allowed-bitmap-64bitMD5s" : [ 1209453360120438698 ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt
index b8d43a37e3..1bc40b73bb 100644
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt
+++ b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt
@@ -2,10 +2,10 @@
    "actual-results" : {
       "failed" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 12927999507540085554
+            "bitmap-64bitMD5" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 1209453360120438698
+            "bitmap-64bitMD5" : 1209453360120438698
          }
       },
       "failure-ignored" : null,
@@ -14,11 +14,11 @@
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 8863920166200910451 ],
+         "allowed-bitmap-64bitMD5s" : [ 8863920166200910451 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 13451349865803053525 ],
+         "allowed-bitmap-64bitMD5s" : [ 13451349865803053525 ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt b/gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt
index 3d3e1e4d0f..8865b0ce38 100644
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt
+++ b/gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt
@@ -4,16 +4,16 @@
       "failure-ignored" : null,
       "no-comparison" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 12927999507540085554
+            "bitmap-64bitMD5" : 12927999507540085554
          },
          "565/selftest2" : {
-            "bitmap-cityhash" : 8863920166200910451
+            "bitmap-64bitMD5" : 8863920166200910451
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 1209453360120438698
+            "bitmap-64bitMD5" : 1209453360120438698
          },
          "8888/selftest2" : {
-            "bitmap-cityhash" : 13451349865803053525
+            "bitmap-64bitMD5" : 13451349865803053525
          }
       },
       "succeeded" : null
diff --git a/gm/tests/outputs/no-readpath/output-expected/json-summary.txt b/gm/tests/outputs/no-readpath/output-expected/json-summary.txt
index 5140616bf0..1009e926a5 100644
--- a/gm/tests/outputs/no-readpath/output-expected/json-summary.txt
+++ b/gm/tests/outputs/no-readpath/output-expected/json-summary.txt
@@ -4,10 +4,10 @@
       "failure-ignored" : null,
       "no-comparison" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 12927999507540085554
+            "bitmap-64bitMD5" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 1209453360120438698
+            "bitmap-64bitMD5" : 1209453360120438698
          }
       },
       "succeeded" : null
diff --git a/gm/tests/outputs/nonverbose/output-expected/json-summary.txt b/gm/tests/outputs/nonverbose/output-expected/json-summary.txt
index e55c38c5fa..c5edc8aff9 100644
--- a/gm/tests/outputs/nonverbose/output-expected/json-summary.txt
+++ b/gm/tests/outputs/nonverbose/output-expected/json-summary.txt
@@ -4,21 +4,21 @@
       "failure-ignored" : null,
       "no-comparison" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 12927999507540085554
+            "bitmap-64bitMD5" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 1209453360120438698
+            "bitmap-64bitMD5" : 1209453360120438698
          }
       },
       "succeeded" : null
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : null,
+         "allowed-bitmap-64bitMD5s" : null,
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : null,
+         "allowed-bitmap-64bitMD5s" : null,
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt b/gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt
index 506191d981..5c12f9e983 100644
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt
+++ b/gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt
@@ -2,31 +2,31 @@
    "actual-results" : {
       "failed" : {
          "comparison/selftest1-pipe" : {
-            "bitmap-cityhash" : 6140979239232854774
+            "bitmap-64bitMD5" : 6140979239232854774
          }
       },
       "failure-ignored" : null,
       "no-comparison" : null,
       "succeeded" : {
          "565/selftest1" : {
-            "bitmap-cityhash" : 12927999507540085554
+            "bitmap-64bitMD5" : 12927999507540085554
          },
          "8888/selftest1" : {
-            "bitmap-cityhash" : 1209453360120438698
+            "bitmap-64bitMD5" : 1209453360120438698
          }
       }
    },
    "expected-results" : {
       "565/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 12927999507540085554 ],
+         "allowed-bitmap-64bitMD5s" : [ 12927999507540085554 ],
          "ignore-failure" : false
       },
       "8888/selftest1" : {
-         "allowed-bitmap-cityhashes" : [ 1209453360120438698 ],
+         "allowed-bitmap-64bitMD5s" : [ 1209453360120438698 ],
          "ignore-failure" : false
       },
       "comparison/selftest1-pipe" : {
-         "allowed-bitmap-cityhashes" : [ 1209453360120438698 ],
+         "allowed-bitmap-64bitMD5s" : [ 1209453360120438698 ],
          "ignore-failure" : false
       }
    }