make GM self-test run gm/rebaseline_server unittests

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 29 matching lines @@
   diff -r --exclude=.* $1 $2
   if [ $? != 0 ]; then
     echo "failed in: compare_directories $1 $2"
     ENCOUNTERED_ANY_ERRORS=1
   fi
 }
 
 # Run a command, and validate that it succeeds (returns 0).
 function assert_passes {
   COMMAND="$1"
-  OUTPUT=$($COMMAND 2>&1)
+  echo
+  echo "assert_passes $COMMAND ..."

[epoger, 2014/01/24 17:35:48]

I think it's better for the output to include more info about what ran,
especially for debugging failures on the bots.

+  $COMMAND
   if [ $? != 0 ]; then
     echo "This command was supposed to pass, but failed: [$COMMAND]"
-    echo $OUTPUT
     ENCOUNTERED_ANY_ERRORS=1
   fi
 }
 
 # Run a command, and validate that it fails (returns nonzero).
 function assert_fails {
   COMMAND="$1"
-  OUTPUT=$($COMMAND 2>&1)
+  echo
+  echo "assert_fails $COMMAND ..."
+  $COMMAND
   if [ $? == 0 ]; then
     echo "This command was supposed to fail, but passed: [$COMMAND]"
-    echo $OUTPUT
     ENCOUNTERED_ANY_ERRORS=1
   fi
 }
 
 # Run gm...
 # - with the arguments in $1
 # - writing stdout into $2/$OUTPUT_ACTUAL_SUBDIR/stdout
 # - writing json summary into $2/$OUTPUT_ACTUAL_SUBDIR/json-summary.txt
 # - writing return value into $2/$OUTPUT_ACTUAL_SUBDIR/return_value
 # Then compare all of those against $2/$OUTPUT_EXPECTED_SUBDIR .
@@ skipping 192 matching lines @@
 # Exercise display_json_results.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/display_json_results.py $GM_OUTPUTS/$CASE/$OUTPUT_EXPECTED_SUBDIR/json-summary.txt"
 done
 for CASE in $FAILING_CASES; do
   assert_fails "python gm/display_json_results.py $GM_OUTPUTS/$CASE/$OUTPUT_EXPECTED_SUBDIR/json-summary.txt"
 done
 
+# Exercise all rebaseline_server unittests.
+assert_passes "python gm/rebaseline_server/test_all.py"
+
 if [ $ENCOUNTERED_ANY_ERRORS == 0 ]; then
   echo "All tests passed."
   exit 0
 else
   exit 1
 fi