make GM self-test run gm/rebaseline_server unittests

R=borenet@google.com

Author: epoger@google.com

Review URL: https://codereview.chromium.org/143983017

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

diff --git a/gm/rebaseline_server/test_all.py b/gm/rebaseline_server/test_all.py
index ba3d8fd..299d134 100755 (executable)
--- a/gm/rebaseline_server/test_all.py
+++ b/gm/rebaseline_server/test_all.py
@@ -19,8 +19,10 @@ import unittest
 def main():
   suite = unittest.TestLoader().discover(os.path.dirname(__file__),
                                          pattern='*_test.py')
-  unittest.TextTestRunner(verbosity=2).run(suite)
-
+  results = unittest.TextTestRunner(verbosity=2).run(suite)
+  print repr(results)
+  if not results.wasSuccessful():
+    raise Exception('failed one or more unittests')
 
 if __name__ == '__main__':
   main()

diff --git a/gm/tests/run.sh b/gm/tests/run.sh
index 7e1f03d..29074e5 100755 (executable)
--- a/gm/tests/run.sh
+++ b/gm/tests/run.sh
@@ -47,10 +47,11 @@ function compare_directories {
 # Run a command, and validate that it succeeds (returns 0).
 function assert_passes {
   COMMAND="$1"
-  OUTPUT=$($COMMAND 2>&1)
+  echo
+  echo "assert_passes $COMMAND ..."
+  $COMMAND
   if [ $? != 0 ]; then
     echo "This command was supposed to pass, but failed: [$COMMAND]"
-    echo $OUTPUT
     ENCOUNTERED_ANY_ERRORS=1
   fi
 }
@@ -58,10 +59,11 @@ function assert_passes {
 # 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
 }
@@ -274,6 +276,9 @@ 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