Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 15 insertions, 1 deletions

diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php
index 67d006b3..6b2bf479 100644
--- a/modules/gallery_unit_test/controllers/gallery_unit_test.php
+++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php
@@ -132,7 +132,8 @@ class Gallery_Unit_Test_Controller extends Controller {
       graphics::choose_default_toolkit();
 
       $filter = count($_SERVER["argv"]) > 2 ? $_SERVER["argv"][2] : null;
-      print new Unit_Test($modules, $filter);
+      $unit_test = new Unit_Test($modules, $filter);
+      print $unit_test;
     } catch (ORM_Validation_Exception $e) {
       print "Validation Exception: {$e->getMessage()}\n";
       print $e->getTraceAsString() . "\n";
@@ -143,5 +144,18 @@ class Gallery_Unit_Test_Controller extends Controller {
       print "Exception: {$e->getMessage()}\n";
       print $e->getTraceAsString() . "\n";
     }
+
+    if (!isset($unit_test)) {
+      // If an exception is thrown, it's possible that $unit_test was never set.
+      $failed = 1;
+    } else {
+      $failed = 0;
+      foreach ($unit_test->stats as $class => $stats) {
+        $failed += ($stats["failed"] + $stats["errors"]);
+      }
+    }
+    if (PHP_SAPI == 'cli') {
+      exit($failed);
+    }
   }
 }