From b6bbbd031b785eaff1e91ccb3d5acc28ec1f6977 Mon Sep 17 00:00:00 2001
From: Jan Steemann <jan@arangodb.com>
Date: Wed, 23 Apr 2014 17:52:29 +0200
Subject: [PATCH] halt on test failure

---
 arangod/RestServer/ArangoServer.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/arangod/RestServer/ArangoServer.cpp b/arangod/RestServer/ArangoServer.cpp
index 9b30146c45..a3b20492fc 100644
--- a/arangod/RestServer/ArangoServer.cpp
+++ b/arangod/RestServer/ArangoServer.cpp
@@ -857,17 +857,19 @@ int ArangoServer::startupServer () {
 
   OperationMode::server_operation_mode_e mode = OperationMode::determineMode(_applicationServer->programOptions());
 
+  int res;
+
   if (mode == OperationMode::MODE_CONSOLE) {
-    runConsole(vocbase);
+    res = runConsole(vocbase);
   }
   else if (mode == OperationMode::MODE_UNITTESTS) {
-    runUnitTests(vocbase);
+    res = runUnitTests(vocbase);
   }
   else if (mode == OperationMode::MODE_SCRIPT) {
-    runScript(vocbase);
+    res = runScript(vocbase);
   }
   else {
-    runServer(vocbase);
+    res = runServer(vocbase);
   }
 
   _applicationServer->stop();
@@ -878,7 +880,7 @@ int ArangoServer::startupServer () {
     cout << endl << TRI_BYE_MESSAGE << endl;
   }
 
-  return 0;
+  return res;
 }
 
 // -----------------------------------------------------------------------------
@@ -890,7 +892,6 @@ int ArangoServer::startupServer () {
 ////////////////////////////////////////////////////////////////////////////////
 
 int ArangoServer::runServer (TRI_vocbase_t* vocbase) {
-
   // just wait until we are signalled
   _applicationServer->wait();