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 devel

This commit is contained in:
jsteemann 2016-06-01 15:06:44 +02:00
parent 7bb5675031 eae752786f
commit 21d0be76e6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4023,7 +4023,7 @@ function unitTest(cases, options) {
ARANGORESTORE_BIN, ARANGORESTORE_BIN,
ARANGOSH_BIN]; ARANGOSH_BIN];
for (let b = 0; b < checkFiles.length; ++b) { for (let b = 0; b < checkFiles.length; ++b) {
if (! fs.isFile(checkFiles[b])) { if (! fs.isFile(checkFiles[b]) && ! fs.isFile(checkFiles[b]+ ".exe" )) {
throw "unable to locate " + checkFiles[b]; throw "unable to locate " + checkFiles[b];
} }
} }

8
utils/generateExamples.js
View File

@ -36,20 +36,20 @@ let ARANGOSH;
function locateArangod() { function locateArangod() {
ARANGOD = fs.join(fs.join(fs.makeAbsolute('')), "build/bin/arangod"); ARANGOD = fs.join(fs.join(fs.makeAbsolute('')), "build/bin/arangod");
if(!fs.isFile(ARANGOD)) { if(!fs.isFile(ARANGOD) && !!fs.isFile(ARANGOD + ".exe")) {
ARANGOD = fs.join(fs.join(fs.makeAbsolute('')), "bin/arangod"); ARANGOD = fs.join(fs.join(fs.makeAbsolute('')), "bin/arangod");
} }
if(!fs.isFile(ARANGOD)) { if(!fs.isFile(ARANGOD) && !!fs.isFile(ARANGOD + ".exe")) {
throw "Cannot find Aarangod to execute tests against"; throw "Cannot find Aarangod to execute tests against";
} }
} }
function locateArangosh() { function locateArangosh() {
ARANGOSH = fs.join(fs.join(fs.makeAbsolute('')), "build/bin/arangosh"); ARANGOSH = fs.join(fs.join(fs.makeAbsolute('')), "build/bin/arangosh");
if(!fs.isFile(ARANGOSH)) { if(!fs.isFile(ARANGOSH) && !!fs.isFile(ARANGOSH + ".exe")) {
ARANGOSH = fs.join(fs.join(fs.makeAbsolute('')), "bin/arangosh"); ARANGOSH = fs.join(fs.join(fs.makeAbsolute('')), "bin/arangosh");
} }
if(!fs.isFile(ARANGOSH)) { if(!fs.isFile(ARANGOSH) && !!fs.isFile(ARANGOSH + ".exe")) {
throw "Cannot find arangosh to run tests with"; throw "Cannot find arangosh to run tests with";
} }
} }