aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm
diff options
context:
space:
mode:
authorGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-10 15:56:44 +0000
committerGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-10 15:56:44 +0000
commit8e910abcb71afd9e77996765be52f0e307a8c918 (patch)
tree2c3a26a31cc4caad778d83bccf358be667c5c0f0 /gm
parente1a89ca448a9b33aba0893769fbb686154c889fb (diff)
gm self-test: update expected dashing2.png images (in inputs/ dir) to reflect new behavior
TBR=reed1 Review URL: https://codereview.appspot.com/7068060 git-svn-id: http://skia.googlecode.com/svn/trunk@7116 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm')
-rw-r--r--gm/tests/inputs/identical-bytes/8888/dashing2.pngbin27267 -> 27299 bytes
-rw-r--r--gm/tests/inputs/identical-pixels/8888/dashing2.pngbin25966 -> 25998 bytes
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes/output-expected/json-summary.txt12
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes/output-expected/return_value2
-rw-r--r--gm/tests/outputs/compared-against-identical-bytes/output-expected/stdout3
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels/output-expected/json-summary.txt12
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels/output-expected/return_value2
-rw-r--r--gm/tests/outputs/compared-against-identical-pixels/output-expected/stdout3
8 files changed, 16 insertions, 18 deletions
diff --git a/gm/tests/inputs/identical-bytes/8888/dashing2.png b/gm/tests/inputs/identical-bytes/8888/dashing2.png
index 465c0199df..cb858d7575 100644
--- a/gm/tests/inputs/identical-bytes/8888/dashing2.png
+++ b/gm/tests/inputs/identical-bytes/8888/dashing2.png
Binary files differ
diff --git a/gm/tests/inputs/identical-pixels/8888/dashing2.png b/gm/tests/inputs/identical-pixels/8888/dashing2.png
index 2d05b01b01..86d5bce6d3 100644
--- a/gm/tests/inputs/identical-pixels/8888/dashing2.png
+++ b/gm/tests/inputs/identical-pixels/8888/dashing2.png
Binary files 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 8b6bca2da1..6f812e05c8 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,17 +1,17 @@
{
"actual-results" : {
- "failed" : {
+ "failed" : null,
+ "failure-ignored" : null,
+ "no-comparison" : null,
+ "succeeded" : {
"8888/dashing2" : {
"checksum" : 16595425910463109922
}
- },
- "failure-ignored" : null,
- "no-comparison" : null,
- "succeeded" : null
+ }
},
"expected-results" : {
"8888/dashing2" : {
- "checksums" : [ 2675870163990933333 ],
+ "checksums" : [ 16595425910463109922 ],
"ignore-failure" : false
}
}
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 22bd7908a5..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,5 +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]
-Ran 1 tests: 0 passed, 1 failed, 0 missing reference images
- 8888/dashing2 pixel_error
+Ran 1 tests: 1 passed, 0 failed, 0 missing reference images
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 8b6bca2da1..6f812e05c8 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,17 +1,17 @@
{
"actual-results" : {
- "failed" : {
+ "failed" : null,
+ "failure-ignored" : null,
+ "no-comparison" : null,
+ "succeeded" : {
"8888/dashing2" : {
"checksum" : 16595425910463109922
}
- },
- "failure-ignored" : null,
- "no-comparison" : null,
- "succeeded" : null
+ }
},
"expected-results" : {
"8888/dashing2" : {
- "checksums" : [ 2675870163990933333 ],
+ "checksums" : [ 16595425910463109922 ],
"ignore-failure" : false
}
}
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 857c22606d..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,5 +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]
-Ran 1 tests: 0 passed, 1 failed, 0 missing reference images
- 8888/dashing2 pixel_error
+Ran 1 tests: 1 passed, 0 failed, 0 missing reference images