Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

halt on test failure

This commit is contained in:
Jan Steemann 2014-04-23 17:52:29 +02:00
parent ce54ce59f8
commit b6bbbd031b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arangod/RestServer/ArangoServer.cpp
View File

@ -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();