Index: build/unittest.sh
===================================================================
diff -u -r565aaee463eaa5e21dec1fd5dadba95505090b00 -rd719a6a96efb4e6d232dc7465452775467605799
--- build/unittest.sh	(.../unittest.sh)	(revision 565aaee463eaa5e21dec1fd5dadba95505090b00)
+++ build/unittest.sh	(.../unittest.sh)	(revision d719a6a96efb4e6d232dc7465452775467605799)
@@ -76,5 +76,8 @@
 
 echo " ------------------------------ Stoping the Squish Server"
 $SQUISH_DIR/bin/squishserver --port=$SQUISH_SERVER_PORT --stop
-
-exit $UNITTEST_RESULT
+if [[ -z $StopOnUnitTestError ]]; then
+    exit 0
+else
+    exit $UNITTEST_RESULT
+fi