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

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2014-10-28 18:10:29 +01:00
parent 2e9100619a a25f5aa513
commit da61ef9c44
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/server/modules/org/arangodb/testing.js
View File

@ -272,8 +272,12 @@ function startInstance (protocol, options, addArgs, testname) {
var valgrindXmlFileBase = "";
if (typeof(options.valgrind) === 'string') {
runInValgrind = options.valgrind;
valgrindopts = options.valgrindargs;
valgrindXmlFileBase = options.valgrindXmlFileBase;
if (options.hasOwnProperty("valgrindargs")) {
valgrindopts = options.valgrindargs;
}
if (options.hasOwnProperty("valgrindXmlFileBase")) {
valgrindXmlFileBase = options.valgrindXmlFileBase;
}
}
var p = new Planner({"numberOfDBservers" : 2,