ran gm/tests/rebaseline.sh 5-6 times to update the self-test after 6984

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

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 465c019..cb858d7 100644 (file)
Binary files a/gm/tests/outputs/compared-against-different-pixels/output-expected/images/8888/dashing2.png and b/gm/tests/outputs/compared-against-different-pixels/output-expected/images/8888/dashing2.png differ

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 180b9ef..182dd0e 100644 (file)
--- 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" : 2675870163990933333
+            "checksum" : 16595425910463109922
          }
       },
       "failure-ignored" : null,

diff --git a/gm/tests/outputs/compared-against-different-pixels/output-expected/stdout b/gm/tests/outputs/compared-against-different-pixels/output-expected/stdout
index 3833cbe..0463161 100644 (file)
--- a/gm/tests/outputs/compared-against-different-pixels/output-expected/stdout
+++ b/gm/tests/outputs/compared-against-different-pixels/output-expected/stdout
@@ -1,6 +1,6 @@
 reading from gm/tests/inputs/different-pixels
 writing to gm/tests/outputs/compared-against-different-pixels/output-actual/images
 drawing... dashing2 [640 480]
------  max pixel mismatch for 8888/dashing2 is 51
+-----  max pixel mismatch for 8888/dashing2 is 64
 Ran 1 tests: 0 passed, 1 failed, 0 missing reference images
-               8888/dashing2 pixel_error 51
+               8888/dashing2 pixel_error 64

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 465c019..cb858d7 100644 (file)
Binary files a/gm/tests/outputs/compared-against-empty-dir/output-expected/images/8888/dashing2.png and b/gm/tests/outputs/compared-against-empty-dir/output-expected/images/8888/dashing2.png differ

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 bdc8f8a..509b0c2 100644 (file)
--- 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" : 2675870163990933333
+            "checksum" : 16595425910463109922
          }
       },
       "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 465c019..cb858d7 100644 (file)
Binary files a/gm/tests/outputs/compared-against-identical-bytes/output-expected/images/8888/dashing2.png and b/gm/tests/outputs/compared-against-identical-bytes/output-expected/images/8888/dashing2.png differ

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 dcfa9f6..8b6bca2 100644 (file)
--- 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" : null,
-      "failure-ignored" : null,
-      "no-comparison" : null,
-      "succeeded" : {
+      "failed" : {
          "8888/dashing2" : {
-            "checksum" : 2675870163990933333
+            "checksum" : 16595425910463109922
          }
-      }
+      },
+      "failure-ignored" : null,
+      "no-comparison" : null,
+      "succeeded" : null
    },
    "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 573541a..ace9d03 100644 (file)
--- 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 @@
-0
+255

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 301f17f..3b8f7c3 100644 (file)
--- a/gm/tests/outputs/compared-against-identical-bytes/output-expected/stdout
+++ b/gm/tests/outputs/compared-against-identical-bytes/output-expected/stdout
@@ -1,4 +1,6 @@
 reading from gm/tests/inputs/identical-bytes
 writing to gm/tests/outputs/compared-against-identical-bytes/output-actual/images
 drawing... dashing2 [640 480]
-Ran 1 tests: 1 passed, 0 failed, 0 missing reference images
+-----  max pixel mismatch for 8888/dashing2 is 64
+Ran 1 tests: 0 passed, 1 failed, 0 missing reference images
+               8888/dashing2 pixel_error 64

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 465c019..cb858d7 100644 (file)
Binary files a/gm/tests/outputs/compared-against-identical-pixels/output-expected/images/8888/dashing2.png and b/gm/tests/outputs/compared-against-identical-pixels/output-expected/images/8888/dashing2.png differ

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 dcfa9f6..8b6bca2 100644 (file)
--- 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" : null,
-      "failure-ignored" : null,
-      "no-comparison" : null,
-      "succeeded" : {
+      "failed" : {
          "8888/dashing2" : {
-            "checksum" : 2675870163990933333
+            "checksum" : 16595425910463109922
          }
-      }
+      },
+      "failure-ignored" : null,
+      "no-comparison" : null,
+      "succeeded" : null
    },
    "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 573541a..ace9d03 100644 (file)
--- 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 @@
-0
+255

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 00868ac..5415dad 100644 (file)
--- a/gm/tests/outputs/compared-against-identical-pixels/output-expected/stdout
+++ b/gm/tests/outputs/compared-against-identical-pixels/output-expected/stdout
@@ -1,4 +1,6 @@
 reading from gm/tests/inputs/identical-pixels
 writing to gm/tests/outputs/compared-against-identical-pixels/output-actual/images
 drawing... dashing2 [640 480]
-Ran 1 tests: 1 passed, 0 failed, 0 missing reference images
+-----  max pixel mismatch for 8888/dashing2 is 64
+Ran 1 tests: 0 passed, 1 failed, 0 missing reference images
+               8888/dashing2 pixel_error 64

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 465c019..cb858d7 100644 (file)
Binary files a/gm/tests/outputs/no-readpath/output-expected/images/8888/dashing2.png and b/gm/tests/outputs/no-readpath/output-expected/images/8888/dashing2.png differ

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 09f095c..3b93856 100644 (file)
--- 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" : 2675870163990933333
+            "checksum" : 16595425910463109922
          }
       },
       "succeeded" : null