GM self-tests: add testing for non --hierarchy case

gm/tests/run.sh

 #!/bin/bash
 
 # Self-tests for gm, based on tools/tests/run.sh
 #
 # These tests are run by the Skia_PerCommit_House_Keeping bot at every commit,
 # so make sure that they still pass when you make changes to gm!
 #
 # To generate new baselines when gm behavior changes, run gm/tests/rebaseline.sh
 #
 # TODO: because this is written as a shell script (instead of, say, Python)
@@ skipping 87 matching lines @@
   # Python soon, and make stuff like this more maintainable.
   grep ^GM: $ACTUAL_OUTPUT_DIR/stdout >$ACTUAL_OUTPUT_DIR/stdout-tmp
   mv $ACTUAL_OUTPUT_DIR/stdout-tmp $ACTUAL_OUTPUT_DIR/stdout
   grep ^GM: $ACTUAL_OUTPUT_DIR/stderr >$ACTUAL_OUTPUT_DIR/stderr-tmp
   mv $ACTUAL_OUTPUT_DIR/stderr-tmp $ACTUAL_OUTPUT_DIR/stderr
 
   # Replace image file contents with just the filename, for two reasons:
   # 1. Image file encoding may vary by platform
   # 2. https://code.google.com/p/chromium/issues/detail?id=169600
   #    ('gcl/upload.py fail to upload binary files to rietveld')
-  for IMAGEFILE in $(ls $ACTUAL_OUTPUT_DIR/*/*/*.png); do
+  for IMAGEFILE in $(find $ACTUAL_OUTPUT_DIR -name *.png); do
     echo "[contents of $IMAGEFILE]" >$IMAGEFILE
   done
-  for MISMATCHDIR in $(ls -d $ACTUAL_OUTPUT_DIR/mismatchPath/*); do
-    echo "Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories." >$MISMATCHDIR/bogusfile
-  done
+  if [ -d $ACTUAL_OUTPUT_DIR/mismatchPath ]; then
+    for MISMATCHDIR in $(find $ACTUAL_OUTPUT_DIR/mismatchPath -mindepth 1 -type d); do
+      echo "Created additional file to make sure directory isn't empty, because self-test cannot handle empty directories." >$MISMATCHDIR/bogusfile
+    done
+  fi
 
   compare_directories $EXPECTED_OUTPUT_DIR $ACTUAL_OUTPUT_DIR
 }
 
 # Create input dir (at path $1) with expectations (both image and json)
 # that gm will match or mismatch as appropriate.
 #
-# We used to check these files into SVN, but then we needed to rebasline them
+# We used to check these files into SVN, but then we needed to rebaseline them
 # when our drawing changed at all... so, as proposed in
 # http://code.google.com/p/skia/issues/detail?id=1068 , we generate them
 # new each time.
 function create_inputs_dir {
   if [ $# != 1 ]; then
     echo "create_inputs_dir requires exactly 1 parameter, got $#"
     exit 1
   fi
   INPUTS_DIR="$1"
   IMAGES_DIR=$INPUTS_DIR/images
   JSON_DIR=$INPUTS_DIR/json
   mkdir -p $IMAGES_DIR $JSON_DIR
 
-  mkdir -p $IMAGES_DIR/identical-bytes
+  THIS_IMAGE_DIR=$IMAGES_DIR/identical-bytes
+  mkdir -p $THIS_IMAGE_DIR
   # Run GM to write out the images actually generated.
-  $GM_BINARY --hierarchy --match selftest1 $CONFIGS \
-    -w $IMAGES_DIR/identical-bytes
+  $GM_BINARY --hierarchy --match selftest1 $CONFIGS -w $THIS_IMAGE_DIR
   # Run GM again to read in those images and write them out as a JSON summary.
-  $GM_BINARY --hierarchy --match selftest1 $CONFIGS \
-    -r $IMAGES_DIR/identical-bytes \
+  $GM_BINARY --hierarchy --match selftest1 $CONFIGS -r $THIS_IMAGE_DIR \
     --writeJsonSummaryPath $JSON_DIR/identical-bytes.json
 
-  mkdir -p $IMAGES_DIR/identical-pixels
-  $GM_BINARY --hierarchy --match selftest1 $CONFIGS \
-    -w $IMAGES_DIR/identical-pixels
+  THIS_IMAGE_DIR=$IMAGES_DIR/identical-pixels
+  mkdir -p $THIS_IMAGE_DIR
+  $GM_BINARY --hierarchy --match selftest1 $CONFIGS -w $THIS_IMAGE_DIR
   echo "more bytes that do not change the image pixels" \
-    >> $IMAGES_DIR/identical-pixels/8888/selftest1.png
+    >> $THIS_IMAGE_DIR/8888/selftest1.png
   echo "more bytes that do not change the image pixels" \
-    >> $IMAGES_DIR/identical-pixels/565/selftest1.png
-  $GM_BINARY --hierarchy --match selftest1 $CONFIGS \
-    -r $IMAGES_DIR/identical-pixels \
+    >> $THIS_IMAGE_DIR/565/selftest1.png
+  $GM_BINARY --hierarchy --match selftest1 $CONFIGS -r $THIS_IMAGE_DIR \
     --writeJsonSummaryPath $JSON_DIR/identical-pixels.json
 
-  mkdir -p $IMAGES_DIR/different-pixels
-  $GM_BINARY --hierarchy --match selftest2 $CONFIGS \
-    -w $IMAGES_DIR/different-pixels
-  mv $IMAGES_DIR/different-pixels/8888/selftest2.png \
-    $IMAGES_DIR/different-pixels/8888/selftest1.png
-  mv $IMAGES_DIR/different-pixels/565/selftest2.png \
-    $IMAGES_DIR/different-pixels/565/selftest1.png
-  $GM_BINARY --hierarchy --match selftest1 $CONFIGS \
-    -r $IMAGES_DIR/different-pixels \
+  THIS_IMAGE_DIR=$IMAGES_DIR/different-pixels
+  mkdir -p $THIS_IMAGE_DIR
+  $GM_BINARY --hierarchy --match selftest2 $CONFIGS -w $THIS_IMAGE_DIR
+  mv $THIS_IMAGE_DIR/8888/selftest2.png $THIS_IMAGE_DIR/8888/selftest1.png
+  mv $THIS_IMAGE_DIR/565/selftest2.png  $THIS_IMAGE_DIR/565/selftest1.png
+  $GM_BINARY --hierarchy --match selftest1 $CONFIGS -r $THIS_IMAGE_DIR \
     --writeJsonSummaryPath $JSON_DIR/different-pixels.json
 
+  THIS_IMAGE_DIR=$IMAGES_DIR/different-pixels-no-hierarchy
+  mkdir -p $THIS_IMAGE_DIR
+  $GM_BINARY --match selftest2 $CONFIGS -w $THIS_IMAGE_DIR
+  mv $THIS_IMAGE_DIR/selftest2_8888.png $THIS_IMAGE_DIR/selftest1_8888.png
+  mv $THIS_IMAGE_DIR/selftest2_565.png  $THIS_IMAGE_DIR/selftest1_565.png
+  $GM_BINARY --match selftest1 $CONFIGS -r $THIS_IMAGE_DIR \
+    --writeJsonSummaryPath $JSON_DIR/different-pixels-no-hierarchy.json
+
   mkdir -p $IMAGES_DIR/empty-dir
 }
 
 GM_TESTDIR=gm/tests
 GM_INPUTS=$GM_TESTDIR/inputs
 GM_OUTPUTS=$GM_TESTDIR/outputs
 GM_TEMPFILES=$GM_TESTDIR/tempfiles
 
 create_inputs_dir $GM_INPUTS
 
@@ skipping 25 matching lines @@
 
 # Test what happens if a subset of the renderModes fail (e.g. pipe)
 gm_test "--simulatePipePlaybackFailure --verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/identical-pixels.json" "$GM_OUTPUTS/pipe-playback-failure"
 
 # Confirm that IntentionallySkipped tests are recorded as such.
 gm_test "--verbose --hierarchy --match selftest1 selftest2 $CONFIGS" "$GM_OUTPUTS/intentionally-skipped-tests"
 
 # Ignore some error types (including ExpectationsMismatch)
 gm_test "--ignoreErrorTypes ExpectationsMismatch NoGpuContext --verbose --hierarchy --match selftest1 $CONFIGS -r $GM_INPUTS/json/different-pixels.json" "$GM_OUTPUTS/ignore-expectations-mismatch"
 
+# Test non-hierarchical mode.
+gm_test "--verbose --match selftest1 $CONFIGS -r $GM_INPUTS/json/different-pixels-no-hierarchy.json" "$GM_OUTPUTS/no-hierarchy"
+
 # Exercise confirm_no_failures_in_json.py
 PASSING_CASES="compared-against-identical-bytes-json compared-against-identical-pixels-json"
 FAILING_CASES="compared-against-different-pixels-json"
 for CASE in $PASSING_CASES; do
   assert_passes "python gm/confirm_no_failures_in_json.py $GM_OUTPUTS/$CASE/$OUTPUT_EXPECTED_SUBDIR/json-summary.txt"
 done
 for CASE in $FAILING_CASES; do
   assert_fails "python gm/confirm_no_failures_in_json.py $GM_OUTPUTS/$CASE/$OUTPUT_EXPECTED_SUBDIR/json-summary.txt"
 done
 
 if [ $ENCOUNTERED_ANY_ERRORS == 0 ]; then
   echo "All tests passed."
   exit 0
 else
   exit 1
 fi