gm self-tests: add 565 mode testing, in addition to 8888 mode

Review URL: https://codereview.appspot.com/7229061

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

16 files changed, 64 insertions, 17 deletions

diff --git a/gm/tests/outputs/aaclip-readback/output-expected/command_line b/gm/tests/outputs/aaclip-readback/output-expected/command_line
index a33529b81a..db66e2e11e 100644
--- a/gm/tests/outputs/aaclip-readback/output-expected/command_line
+++ b/gm/tests/outputs/aaclip-readback/output-expected/command_line
@@ -1 +1 @@
-out/Debug/gm --match simpleaaclip_path --config 8888 -r gm/tests/tempfiles/aaclip-images --writeJsonSummary gm/tests/outputs/aaclip-readback/output-actual/json-summary.txt
+out/Debug/gm --match simpleaaclip_path --config 8888 --config 565 -r gm/tests/tempfiles/aaclip-images --writeJsonSummary gm/tests/outputs/aaclip-readback/output-actual/json-summary.txt
diff --git a/gm/tests/outputs/aaclip-readback/output-expected/json-summary.txt b/gm/tests/outputs/aaclip-readback/output-expected/json-summary.txt
index b901edd117..83d2e77fd0 100644
--- a/gm/tests/outputs/aaclip-readback/output-expected/json-summary.txt
+++ b/gm/tests/outputs/aaclip-readback/output-expected/json-summary.txt
@@ -4,12 +4,19 @@
       "failure-ignored" : null,
       "no-comparison" : null,
       "succeeded" : {
+         "simpleaaclip_path_565" : {
+            "checksum" : FAKE
+         },
          "simpleaaclip_path_8888" : {
             "checksum" : FAKE
          }
       }
    },
    "expected-results" : {
+      "simpleaaclip_path_565" : {
+         "checksums" : [ FAKE ],
+         "ignore-failure" : false
+      },
       "simpleaaclip_path_8888" : {
          "checksums" : [ FAKE ],
          "ignore-failure" : false
diff --git a/gm/tests/outputs/aaclip-write/output-expected/command_line b/gm/tests/outputs/aaclip-write/output-expected/command_line
index 5669a2008a..db030e1be5 100644
--- a/gm/tests/outputs/aaclip-write/output-expected/command_line
+++ b/gm/tests/outputs/aaclip-write/output-expected/command_line
@@ -1 +1 @@
-out/Debug/gm --match simpleaaclip_path --config 8888 -w gm/tests/tempfiles/aaclip-images --writeJsonSummary gm/tests/outputs/aaclip-write/output-actual/json-summary.txt
+out/Debug/gm --match simpleaaclip_path --config 8888 --config 565 -w gm/tests/tempfiles/aaclip-images --writeJsonSummary gm/tests/outputs/aaclip-write/output-actual/json-summary.txt
diff --git a/gm/tests/outputs/aaclip-write/output-expected/json-summary.txt b/gm/tests/outputs/aaclip-write/output-expected/json-summary.txt
index ae32bbb75e..832f828743 100644
--- a/gm/tests/outputs/aaclip-write/output-expected/json-summary.txt
+++ b/gm/tests/outputs/aaclip-write/output-expected/json-summary.txt
@@ -3,6 +3,9 @@
       "failed" : null,
       "failure-ignored" : null,
       "no-comparison" : {
+         "simpleaaclip_path_565" : {
+            "checksum" : FAKE
+         },
          "simpleaaclip_path_8888" : {
             "checksum" : FAKE
          }
diff --git a/gm/tests/outputs/compared-against-different-pixels/output-expected/command_line b/gm/tests/outputs/compared-against-different-pixels/output-expected/command_line
index 42926b2577..d887baa3a6 100644
--- a/gm/tests/outputs/compared-against-different-pixels/output-expected/command_line
+++ b/gm/tests/outputs/compared-against-different-pixels/output-expected/command_line
@@ -1 +1 @@
-out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/different-pixels --writeJsonSummary gm/tests/outputs/compared-against-different-pixels/output-actual/json-summary.txt
+out/Debug/gm --hierarchy --match dashing2 --config 8888 --config 565 -r gm/tests/inputs/different-pixels --writeJsonSummary gm/tests/outputs/compared-against-different-pixels/output-actual/json-summary.txt
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 d6c59c0650..37709e1ffc 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
@@ -1,6 +1,9 @@
 {
    "actual-results" : {
       "failed" : {
+         "565/dashing2" : {
+            "checksum" : FAKE
+         },
          "8888/dashing2" : {
             "checksum" : FAKE
          }
@@ -10,6 +13,10 @@
       "succeeded" : null
    },
    "expected-results" : {
+      "565/dashing2" : {
+         "checksums" : [ FAKE ],
+         "ignore-failure" : false
+      },
       "8888/dashing2" : {
          "checksums" : [ FAKE ],
          "ignore-failure" : false
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/command_line b/gm/tests/outputs/compared-against-empty-dir/output-expected/command_line
index e638c2897c..d00ec60ee3 100644
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/command_line
+++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/command_line
@@ -1 +1 @@
-out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/empty-dir --writeJsonSummary gm/tests/outputs/compared-against-empty-dir/output-actual/json-summary.txt
+out/Debug/gm --hierarchy --match dashing2 --config 8888 --config 565 -r gm/tests/inputs/empty-dir --writeJsonSummary gm/tests/outputs/compared-against-empty-dir/output-actual/json-summary.txt
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 73ff348f66..6ffaf35a1d 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
@@ -3,6 +3,9 @@
       "failed" : null,
       "failure-ignored" : null,
       "no-comparison" : {
+         "565/dashing2" : {
+            "checksum" : FAKE
+         },
          "8888/dashing2" : {
             "checksum" : FAKE
          }
@@ -10,6 +13,10 @@
       "succeeded" : null
    },
    "expected-results" : {
+      "565/dashing2" : {
+         "checksums" : null,
+         "ignore-failure" : false
+      },
       "8888/dashing2" : {
          "checksums" : null,
          "ignore-failure" : false
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout b/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout
index 828f51b9dd..246c05b101 100644
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout
+++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/stdout
@@ -1,4 +1,5 @@
 reading from gm/tests/inputs/empty-dir
 drawing... dashing2 [640 480]
 FAILED to read gm/tests/inputs/empty-dir/8888/dashing2.png
+FAILED to read gm/tests/inputs/empty-dir/565/dashing2.png
 Ran 1 tests: 0 passed, 0 failed, 1 missing reference images
diff --git a/gm/tests/outputs/compared-against-identical-bytes/output-expected/command_line b/gm/tests/outputs/compared-against-identical-bytes/output-expected/command_line
index 585f3804e7..d065b13673 100644
--- a/gm/tests/outputs/compared-against-identical-bytes/output-expected/command_line
+++ b/gm/tests/outputs/compared-against-identical-bytes/output-expected/command_line
@@ -1 +1 @@
-out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/identical-bytes --writeJsonSummary gm/tests/outputs/compared-against-identical-bytes/output-actual/json-summary.txt
+out/Debug/gm --hierarchy --match dashing2 --config 8888 --config 565 -r gm/tests/inputs/identical-bytes --writeJsonSummary gm/tests/outputs/compared-against-identical-bytes/output-actual/json-summary.txt
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 9156fb4147..bed3b2d3b4 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
@@ -4,12 +4,19 @@
       "failure-ignored" : null,
       "no-comparison" : null,
       "succeeded" : {
+         "565/dashing2" : {
+            "checksum" : FAKE
+         },
          "8888/dashing2" : {
             "checksum" : FAKE
          }
       }
    },
    "expected-results" : {
+      "565/dashing2" : {
+         "checksums" : [ FAKE ],
+         "ignore-failure" : false
+      },
       "8888/dashing2" : {
          "checksums" : [ FAKE ],
          "ignore-failure" : false
diff --git a/gm/tests/outputs/compared-against-identical-pixels/output-expected/command_line b/gm/tests/outputs/compared-against-identical-pixels/output-expected/command_line
index 361c52f76a..086f98471e 100644
--- a/gm/tests/outputs/compared-against-identical-pixels/output-expected/command_line
+++ b/gm/tests/outputs/compared-against-identical-pixels/output-expected/command_line
@@ -1 +1 @@
-out/Debug/gm --hierarchy --match dashing2 --config 8888 -r gm/tests/inputs/identical-pixels --writeJsonSummary gm/tests/outputs/compared-against-identical-pixels/output-actual/json-summary.txt
+out/Debug/gm --hierarchy --match dashing2 --config 8888 --config 565 -r gm/tests/inputs/identical-pixels --writeJsonSummary gm/tests/outputs/compared-against-identical-pixels/output-actual/json-summary.txt
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 9156fb4147..bed3b2d3b4 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
@@ -4,12 +4,19 @@
       "failure-ignored" : null,
       "no-comparison" : null,
       "succeeded" : {
+         "565/dashing2" : {
+            "checksum" : FAKE
+         },
          "8888/dashing2" : {
             "checksum" : FAKE
          }
       }
    },
    "expected-results" : {
+      "565/dashing2" : {
+         "checksums" : [ FAKE ],
+         "ignore-failure" : false
+      },
       "8888/dashing2" : {
          "checksums" : [ FAKE ],
          "ignore-failure" : false
diff --git a/gm/tests/outputs/no-readpath/output-expected/command_line b/gm/tests/outputs/no-readpath/output-expected/command_line
index 93ffeaeae0..1609465023 100644
--- a/gm/tests/outputs/no-readpath/output-expected/command_line
+++ b/gm/tests/outputs/no-readpath/output-expected/command_line
@@ -1 +1 @@
-out/Debug/gm --hierarchy --match dashing2 --config 8888 --writeJsonSummary gm/tests/outputs/no-readpath/output-actual/json-summary.txt
+out/Debug/gm --hierarchy --match dashing2 --config 8888 --config 565 --writeJsonSummary gm/tests/outputs/no-readpath/output-actual/json-summary.txt
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 04a042ca7b..81db3a22c5 100644
--- a/gm/tests/outputs/no-readpath/output-expected/json-summary.txt
+++ b/gm/tests/outputs/no-readpath/output-expected/json-summary.txt
@@ -3,6 +3,9 @@
       "failed" : null,
       "failure-ignored" : null,
       "no-comparison" : {
+         "565/dashing2" : {
+            "checksum" : FAKE
+         },
          "8888/dashing2" : {
             "checksum" : FAKE
          }
diff --git a/gm/tests/run.sh b/gm/tests/run.sh
index 23e35fef8d..717262ed5c 100755
--- a/gm/tests/run.sh
+++ b/gm/tests/run.sh
@@ -22,6 +22,7 @@ GM_BINARY=out/Debug/gm
 
 OUTPUT_ACTUAL_SUBDIR=output-actual
 OUTPUT_EXPECTED_SUBDIR=output-expected
+CONFIGS="--config 8888 --config 565"
 
 # Compare contents of all files within directories $1 and $2,
 # EXCEPT for any dotfiles.
@@ -100,20 +101,24 @@ function create_inputs_dir {
   mkdir -p $INPUTS_DIR
 
   mkdir -p $INPUTS_DIR/identical-bytes
-  $GM_BINARY --hierarchy --match dashing2 --config 8888 \
+  $GM_BINARY --hierarchy --match dashing2 $CONFIGS \
     -w $INPUTS_DIR/identical-bytes
 
   mkdir -p $INPUTS_DIR/identical-pixels
-  $GM_BINARY --hierarchy --match dashing2 --config 8888 \
+  $GM_BINARY --hierarchy --match dashing2 $CONFIGS \
     -w $INPUTS_DIR/identical-pixels
   echo "more bytes that do not change the image pixels" \
     >> $INPUTS_DIR/identical-pixels/8888/dashing2.png
+  echo "more bytes that do not change the image pixels" \
+    >> $INPUTS_DIR/identical-pixels/565/dashing2.png
 
   mkdir -p $INPUTS_DIR/different-pixels
-  $GM_BINARY --hierarchy --match dashing3 --config 8888 \
+  $GM_BINARY --hierarchy --match dashing3 $CONFIGS \
     -w $INPUTS_DIR/different-pixels
   mv $INPUTS_DIR/different-pixels/8888/dashing3.png \
     $INPUTS_DIR/different-pixels/8888/dashing2.png
+  mv $INPUTS_DIR/different-pixels/565/dashing3.png \
+    $INPUTS_DIR/different-pixels/565/dashing2.png
 
   mkdir -p $INPUTS_DIR/empty-dir
 }
@@ -126,21 +131,21 @@ GM_TEMPFILES=$GM_TESTDIR/tempfiles
 create_inputs_dir $GM_INPUTS
 
 # Compare generated image against an input image file with identical bytes.
-gm_test "--hierarchy --match dashing2 --config 8888 -r $GM_INPUTS/identical-bytes" "$GM_OUTPUTS/compared-against-identical-bytes"
+gm_test "--hierarchy --match dashing2 $CONFIGS -r $GM_INPUTS/identical-bytes" "$GM_OUTPUTS/compared-against-identical-bytes"
 
 # Compare generated image against an input image file with identical pixels but different PNG encoding.
-gm_test "--hierarchy --match dashing2 --config 8888 -r $GM_INPUTS/identical-pixels" "$GM_OUTPUTS/compared-against-identical-pixels"
+gm_test "--hierarchy --match dashing2 $CONFIGS -r $GM_INPUTS/identical-pixels" "$GM_OUTPUTS/compared-against-identical-pixels"
 
 # Compare generated image against an input image file with different pixels.
-gm_test "--hierarchy --match dashing2 --config 8888 -r $GM_INPUTS/different-pixels" "$GM_OUTPUTS/compared-against-different-pixels"
+gm_test "--hierarchy --match dashing2 $CONFIGS -r $GM_INPUTS/different-pixels" "$GM_OUTPUTS/compared-against-different-pixels"
 
 # Compare generated image against an empty "expected image" dir.
-gm_test "--hierarchy --match dashing2 --config 8888 -r $GM_INPUTS/empty-dir" "$GM_OUTPUTS/compared-against-empty-dir"
+gm_test "--hierarchy --match dashing2 $CONFIGS -r $GM_INPUTS/empty-dir" "$GM_OUTPUTS/compared-against-empty-dir"
 
 # If run without "-r", the JSON's "actual-results" section should contain
 # actual checksums marked as "failure-ignored", but the "expected-results"
 # section should be empty.
-gm_test "--hierarchy --match dashing2 --config 8888" "$GM_OUTPUTS/no-readpath"
+gm_test "--hierarchy --match dashing2 $CONFIGS" "$GM_OUTPUTS/no-readpath"
 
 # Run a test which generates partially transparent images, write out those
 # images, and read them back in.
@@ -151,7 +156,7 @@ gm_test "--hierarchy --match dashing2 --config 8888" "$GM_OUTPUTS/no-readpath"
 IMAGEDIR=$GM_TEMPFILES/aaclip-images
 rm -rf $IMAGEDIR
 mkdir -p $IMAGEDIR
-gm_test "--match simpleaaclip_path --config 8888 -w $IMAGEDIR" "$GM_OUTPUTS/aaclip-write"
-gm_test "--match simpleaaclip_path --config 8888 -r $IMAGEDIR" "$GM_OUTPUTS/aaclip-readback"
+gm_test "--match simpleaaclip_path $CONFIGS -w $IMAGEDIR" "$GM_OUTPUTS/aaclip-write"
+gm_test "--match simpleaaclip_path $CONFIGS -r $IMAGEDIR" "$GM_OUTPUTS/aaclip-readback"
 
 echo "All tests passed."