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/arangodb/arangodb into engine-vs-velocystream

This commit is contained in:
jsteemann 2016-08-24 17:48:29 +02:00
parent 1dab450622 795daeea13
commit 0b6815ef77
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/client/modules/@arangodb/testing.js
View File

@ -1452,7 +1452,7 @@ function startInstanceAgency (instanceInfo, protocol, options,
} }
let dir = fs.join(rootDir, 'agency-' + i); let dir = fs.join(rootDir, 'agency-' + i);
fs.makeDirectoryRecursive(dir); fs.makeDirectoryRecursive(dir);
fs.makeDirectoryRecursive(instanceArgs['database.directory']);
instanceInfo.arangods.push(startArango(protocol, options, instanceArgs, rootDir, 'agent')); instanceInfo.arangods.push(startArango(protocol, options, instanceArgs, rootDir, 'agent'));
} }
@ -2658,8 +2658,7 @@ testFuncs.dfdb = function (options) {
fs.makeDirectoryRecursive(dataDir); fs.makeDirectoryRecursive(dataDir);
let results = {}; let results = {};
print(options)
print(args)
results.dfdb = executeAndWait(ARANGOD_BIN, args, options, 'dfdb'); results.dfdb = executeAndWait(ARANGOD_BIN, args, options, 'dfdb');
print(); print();