revert 6938, as running rebaseline.sh did not seem to work.

Binary files gm/tests/outputs/compared-against-identical-bytes/output-expected/images/8888/dashing2.png and gm/tests/outputs/compared-against-identical-bytes/output-actual/images/8888/dashing2.png differ
diff -r '--exclude=.*' gm/tests/outputs/compared-against-identical-bytes/output-expected/json-summary.txt gm/tests/outputs/compared-against-identical-bytes/output-actual/json-summary.txt
5c5
<             "checksum" : 2249048307642991938
---
>             "checksum" : 16595425910463109922
diff -r '--exclude=.*' gm/tests/outputs/compared-against-identical-bytes/output-expected/stdout gm/tests/outputs/compared-against-identical-bytes/output-actual/stdout
4c4
< -----  max pixel mismatch for 8888/dashing2 is 16
---
> -----  max pixel mismatch for 8888/dashing2 is 64
6c6
< 		8888/dashing2 pixel_error 16
---
> 		8888/dashing2 pixel_error 64
failed in: compare_directories gm/tests/outputs/compared-against-identical-bytes/output-expected gm/tests/outputs/compared-against-identical-bytes/output-actual




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

14 files changed, 19 insertions, 23 deletions

diff --git a/gm/tests/outputs/compared-against-different-pixels/output-expected/images/8888/dashing2.png b/gm/tests/outputs/compared-against-different-pixels/output-expected/images/8888/dashing2.png
index 0582055d5e..465c0199df 100644
--- a/gm/tests/outputs/compared-against-different-pixels/output-expected/images/8888/dashing2.png
+++ b/gm/tests/outputs/compared-against-different-pixels/output-expected/images/8888/dashing2.png
diff --git a/gm/tests/outputs/compared-against-different-pixels/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-different-pixels/output-expected/json-summary.txt
index e071b0ba72..180b9efaa2 100644
--- a/gm/tests/outputs/compared-against-different-pixels/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-different-pixels/output-expected/json-summary.txt
@@ -2,7 +2,7 @@
    "actual-results" : {
       "failed" : {
          "8888/dashing2" : {
-            "checksum" : 2249048307642991938
+            "checksum" : 2675870163990933333
          }
       },
       "failure-ignored" : null,
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/images/8888/dashing2.png b/gm/tests/outputs/compared-against-empty-dir/output-expected/images/8888/dashing2.png
index 0582055d5e..465c0199df 100644
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/images/8888/dashing2.png
+++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/images/8888/dashing2.png
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 8473dedf49..bdc8f8ab54 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,7 +4,7 @@
       "failure-ignored" : null,
       "no-comparison" : {
          "8888/dashing2" : {
-            "checksum" : 2249048307642991938
+            "checksum" : 2675870163990933333
          }
       },
       "succeeded" : null
diff --git a/gm/tests/outputs/compared-against-identical-bytes/output-expected/images/8888/dashing2.png b/gm/tests/outputs/compared-against-identical-bytes/output-expected/images/8888/dashing2.png
index 0582055d5e..465c0199df 100644
--- a/gm/tests/outputs/compared-against-identical-bytes/output-expected/images/8888/dashing2.png
+++ b/gm/tests/outputs/compared-against-identical-bytes/output-expected/images/8888/dashing2.png
diff --git a/gm/tests/outputs/compared-against-identical-bytes/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-bytes/output-expected/json-summary.txt
index 8e2d22b497..dcfa9f6d67 100644
--- a/gm/tests/outputs/compared-against-identical-bytes/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-identical-bytes/output-expected/json-summary.txt
@@ -1,13 +1,13 @@
 {
    "actual-results" : {
-      "failed" : {
-         "8888/dashing2" : {
-            "checksum" : 2249048307642991938
-         }
-      },
+      "failed" : null,
       "failure-ignored" : null,
       "no-comparison" : null,
-      "succeeded" : null
+      "succeeded" : {
+         "8888/dashing2" : {
+            "checksum" : 2675870163990933333
+         }
+      }
    },
    "expected-results" : {
       "8888/dashing2" : {
diff --git a/gm/tests/outputs/compared-against-identical-bytes/output-expected/return_value b/gm/tests/outputs/compared-against-identical-bytes/output-expected/return_value
index ace9d03621..573541ac97 100644
--- a/gm/tests/outputs/compared-against-identical-bytes/output-expected/return_value
+++ b/gm/tests/outputs/compared-against-identical-bytes/output-expected/return_value
@@ -1 +1 @@
-255
+0
diff --git a/gm/tests/outputs/compared-against-identical-bytes/output-expected/stdout b/gm/tests/outputs/compared-against-identical-bytes/output-expected/stdout
index fba27f53cc..301f17f5e7 100644
--- a/gm/tests/outputs/compared-against-identical-bytes/output-expected/stdout
+++ b/gm/tests/outputs/compared-against-identical-bytes/output-expected/stdout
@@ -1,6 +1,4 @@
 reading from gm/tests/inputs/identical-bytes
 writing to gm/tests/outputs/compared-against-identical-bytes/output-actual/images
 drawing... dashing2 [640 480]
------  max pixel mismatch for 8888/dashing2 is 16
-Ran 1 tests: 0 passed, 1 failed, 0 missing reference images
-		8888/dashing2 pixel_error 16
+Ran 1 tests: 1 passed, 0 failed, 0 missing reference images
diff --git a/gm/tests/outputs/compared-against-identical-pixels/output-expected/images/8888/dashing2.png b/gm/tests/outputs/compared-against-identical-pixels/output-expected/images/8888/dashing2.png
index 0582055d5e..465c0199df 100644
--- a/gm/tests/outputs/compared-against-identical-pixels/output-expected/images/8888/dashing2.png
+++ b/gm/tests/outputs/compared-against-identical-pixels/output-expected/images/8888/dashing2.png
diff --git a/gm/tests/outputs/compared-against-identical-pixels/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-pixels/output-expected/json-summary.txt
index 8e2d22b497..dcfa9f6d67 100644
--- a/gm/tests/outputs/compared-against-identical-pixels/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-identical-pixels/output-expected/json-summary.txt
@@ -1,13 +1,13 @@
 {
    "actual-results" : {
-      "failed" : {
-         "8888/dashing2" : {
-            "checksum" : 2249048307642991938
-         }
-      },
+      "failed" : null,
       "failure-ignored" : null,
       "no-comparison" : null,
-      "succeeded" : null
+      "succeeded" : {
+         "8888/dashing2" : {
+            "checksum" : 2675870163990933333
+         }
+      }
    },
    "expected-results" : {
       "8888/dashing2" : {
diff --git a/gm/tests/outputs/compared-against-identical-pixels/output-expected/return_value b/gm/tests/outputs/compared-against-identical-pixels/output-expected/return_value
index ace9d03621..573541ac97 100644
--- a/gm/tests/outputs/compared-against-identical-pixels/output-expected/return_value
+++ b/gm/tests/outputs/compared-against-identical-pixels/output-expected/return_value
@@ -1 +1 @@
-255
+0
diff --git a/gm/tests/outputs/compared-against-identical-pixels/output-expected/stdout b/gm/tests/outputs/compared-against-identical-pixels/output-expected/stdout
index 119da16594..00868ac5b1 100644
--- a/gm/tests/outputs/compared-against-identical-pixels/output-expected/stdout
+++ b/gm/tests/outputs/compared-against-identical-pixels/output-expected/stdout
@@ -1,6 +1,4 @@
 reading from gm/tests/inputs/identical-pixels
 writing to gm/tests/outputs/compared-against-identical-pixels/output-actual/images
 drawing... dashing2 [640 480]
------  max pixel mismatch for 8888/dashing2 is 16
-Ran 1 tests: 0 passed, 1 failed, 0 missing reference images
-		8888/dashing2 pixel_error 16
+Ran 1 tests: 1 passed, 0 failed, 0 missing reference images
diff --git a/gm/tests/outputs/no-readpath/output-expected/images/8888/dashing2.png b/gm/tests/outputs/no-readpath/output-expected/images/8888/dashing2.png
index 0582055d5e..465c0199df 100644
--- a/gm/tests/outputs/no-readpath/output-expected/images/8888/dashing2.png
+++ b/gm/tests/outputs/no-readpath/output-expected/images/8888/dashing2.png
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 5ba69d6268..09f095cc26 100644
--- a/gm/tests/outputs/no-readpath/output-expected/json-summary.txt
+++ b/gm/tests/outputs/no-readpath/output-expected/json-summary.txt
@@ -4,7 +4,7 @@
       "failure-ignored" : null,
       "no-comparison" : {
          "8888/dashing2" : {
-            "checksum" : 2249048307642991938
+            "checksum" : 2675870163990933333
          }
       },
       "succeeded" : null