Revert "delete old things!"

This reverts commit 15b125d40122e966bd723d23e82c3224b1da4898.

NOTREECHECKS=true

original change breaks android tree

BUG=skia:

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

7 files changed, 268 insertions, 0 deletions

diff --git a/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json b/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
new file mode 100644
index 0000000000..75b2663307
--- /dev/null
+++ b/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
@@ -0,0 +1,109 @@
+{
+  "actual-results": {
+    "failed": null, 
+    "failure-ignored": null, 
+    "no-comparison": null, 
+    "succeeded": null
+  }, 
+  "expected-results": {
+    "3x3bitmaprect_565.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          16998423976396106083
+        ]
+      ], 
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
+    }, 
+    "3x3bitmaprect_8888.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          2054956815327187963
+        ]
+      ], 
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
+    }, 
+    "aaclip_565.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          6190901827590820995
+        ]
+      ], 
+      "ignore-failure": false
+    }, 
+    "aaclip_8888.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          14456211900777561488
+        ]
+      ], 
+      "ignore-failure": false
+    }, 
+    "filterbitmap_checkerboard_192_192_565.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          9917960313903939620
+        ]
+      ], 
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
+    }, 
+    "filterbitmap_checkerboard_192_192_8888.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          9917960313903939620
+        ]
+      ], 
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
+    }, 
+    "filterbitmap_checkerboard_32_2_565.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          16197252621792695154
+        ]
+      ], 
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
+    }, 
+    "filterbitmap_checkerboard_32_2_8888.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          7634650333321761866
+        ]
+      ], 
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
+    }, 
+    "texdata_gpu.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          2736593828543197285
+        ]
+      ], 
+      "ignore-failure": false
+    }
+  }
+}
diff --git a/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
new file mode 100644
index 0000000000..f3f49bbc3a
--- /dev/null
+++ b/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -0,0 +1,145 @@
+{
+  "actual-results": {
+    "failed": null, 
+    "failure-ignored": null, 
+    "no-comparison": null, 
+    "succeeded": null
+  }, 
+  "expected-results": {
+    "3x3bitmaprect_565.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          16998423976396106083
+        ]
+      ], 
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
+    }, 
+    "3x3bitmaprect_8888.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          2054956815327187963
+        ]
+      ], 
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
+    }, 
+    "3x3bitmaprect_gpu.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          2054956815327187963
+        ]
+      ], 
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
+    }, 
+    "3x3bitmaprect_pdf-mac.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          8518347971308375604
+        ]
+      ], 
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
+    }, 
+    "3x3bitmaprect_pdf-poppler.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          16723580409414313678
+        ]
+      ], 
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
+    }, 
+    "blanket-ignored_565.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          111111111
+        ]
+      ], 
+      "ignore-failure": false
+    }, 
+    "blanket-ignored_8888.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          111111111
+        ]
+      ], 
+      "ignore-failure": false
+    }, 
+    "displacement_565.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          4569468668668628191
+        ]
+      ], 
+      "ignore-failure": false
+    }, 
+    "displacement_8888.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          11401048196735046263
+        ]
+      ], 
+      "ignore-failure": false
+    }, 
+    "displacement_gpu.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          5698561127291561694
+        ]
+      ], 
+      "ignore-failure": false
+    }, 
+    "displacement_mesa.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          3844627628059679694
+        ]
+      ], 
+      "ignore-failure": false
+    }, 
+    "displacement_pdf-mac.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          12901125495691049846
+        ]
+      ], 
+      "ignore-failure": false
+    }, 
+    "displacement_pdf-poppler.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          16285974094717334658
+        ]
+      ], 
+      "bugs": [
+        1578
+      ], 
+      "reviewed-by-human": false
+    }
+  }
+}
diff --git a/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release-Valgrind/expected-results.json b/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release-Valgrind/expected-results.json
new file mode 100644
index 0000000000..a60da4f1db
--- /dev/null
+++ b/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release-Valgrind/expected-results.json
@@ -0,0 +1 @@
+This file should not be read by results.py, so its contents don't matter.
diff --git a/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json b/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json
new file mode 100644
index 0000000000..a60da4f1db
--- /dev/null
+++ b/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json
@@ -0,0 +1 @@
+This file should not be read by results.py, so its contents don't matter.
diff --git a/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-TSAN/expected-results.json b/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-TSAN/expected-results.json
new file mode 100644
index 0000000000..a60da4f1db
--- /dev/null
+++ b/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-TSAN/expected-results.json
@@ -0,0 +1 @@
+This file should not be read by results.py, so its contents don't matter.
diff --git a/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Win7-ShuttleA-HD2000-x86_64-Debug-Trybot/expected-results.json b/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Win7-ShuttleA-HD2000-x86_64-Debug-Trybot/expected-results.json
new file mode 100644
index 0000000000..a60da4f1db
--- /dev/null
+++ b/gm/rebaseline_server/testdata/inputs/gm-expectations/Test-Win7-ShuttleA-HD2000-x86_64-Debug-Trybot/expected-results.json
@@ -0,0 +1 @@
+This file should not be read by results.py, so its contents don't matter.
diff --git a/gm/rebaseline_server/testdata/inputs/gm-expectations/ignored-tests.txt b/gm/rebaseline_server/testdata/inputs/gm-expectations/ignored-tests.txt
new file mode 100644
index 0000000000..b14eb96bbf
--- /dev/null
+++ b/gm/rebaseline_server/testdata/inputs/gm-expectations/ignored-tests.txt
@@ -0,0 +1,10 @@
+# Failures of any GM tests listed in this file will be ignored [1], as
+# if they had been marked "ignore-failure": true in the per-builder
+# expected-results.json files.
+#
+
+blanket-ignored
+
+# "texdata" tests should NOT be ignored, since the next lines is commented out:
+# texdata
+