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-api

This commit is contained in:
jsteemann 2017-04-05 17:01:20 +02:00
parent 1ee5d1a3fe 7514a1a1eb
commit d5bbcf7b1e
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/Books/AQL/book.json
View File

@ -4,7 +4,7 @@
"author": "ArangoDB GmbH",
"description": "Official AQL manual for ArangoDB - the multi-model NoSQL database",
"language": "en",
"plugins":["-search", "-lunr", "-sharing", "toggle-chapters", "addcssjs", "anchorjs", "piwik", "sitemap-general"],
"plugins":["-search", "-lunr", "-sharing", "toggle-chapters", "addcssjs", "anchorjs", "piwik", "sitemap-general", "ga"],
"pdf": {
"fontSize": 12,
"toc": true,
@ -29,6 +29,9 @@
},
"sitemap-general": {
"prefix": "https://docs.arangodb.com/devel/AQL/"
},
"ga": {
"token": "UA-81053435-2"
}
}
}

5
Documentation/Books/HTTP/book.json
View File

@ -4,7 +4,7 @@
"author": "ArangoDB GmbH",
"description": "Official HTTP API manual for ArangoDB - the multi-model NoSQL database",
"language": "en",
"plugins":["-search", "-lunr", "-sharing", "toggle-chapters", "addcssjs", "anchorjs", "piwik", "sitemap-general"],
"plugins":["-search", "-lunr", "-sharing", "toggle-chapters", "addcssjs", "anchorjs", "piwik", "sitemap-general", "ga"],
"pdf": {
"fontSize": 12,
"toc": true,
@ -29,6 +29,9 @@
},
"sitemap-general": {
"prefix": "https://docs.arangodb.com/devel/HTTP/"
},
"ga": {
"token": "UA-81053435-2"
}
}
}

5
Documentation/Books/Manual/book.json
View File

@ -4,7 +4,7 @@
"author": "ArangoDB GmbH",
"description": "Official manual for ArangoDB - the multi-model NoSQL database",
"language": "en",
"plugins":["-search", "-lunr", "-sharing", "toggle-chapters", "addcssjs", "anchorjs", "piwik", "sitemap-general", "callouts@git+https://github.com/Simran-B/gitbook-plugin-callouts.git"],
"plugins":["-search", "-lunr", "-sharing", "toggle-chapters", "addcssjs", "anchorjs", "piwik", "sitemap-general", "ga", "callouts@git+https://github.com/Simran-B/gitbook-plugin-callouts.git"],
"pdf": {
"fontSize": 12,
"toc": true,
@ -29,6 +29,9 @@
},
"sitemap-general": {
"prefix": "https://docs.arangodb.com/devel/Manual/"
},
"ga": {
"token": "UA-81053435-2"
}
}
}

18
UnitTests/unittest.js
View File

@ -12,6 +12,8 @@ const fs = require("fs");
const internal = require("internal");
const inspect = internal.inspect;
let testOutputDirectory;
function makePathGeneric(path) {
return path.split(fs.pathSeparator);
}
@ -136,7 +138,7 @@ function resultsToXml(results, baseName, cluster) {
const fn = makePathGeneric(baseName + xmlName + ".xml").join('_');
fs.write("out/" + fn, xml.join(""));
fs.write(testOutputDirectory + fn, xml.join(""));
}
}
}
@ -181,11 +183,17 @@ function main(argv) {
}
}
if (argv.hasOwnProperty('testOutput')) {
testOutputDirectory = argv.testOutput;
} else {
testOutputDirectory = 'out';
}
// force json reply
options.jsonReply = true;
// create output directory
fs.makeDirectoryRecursive("out");
fs.makeDirectoryRecursive(testOutputDirectory);
// run the test and store the result
let r = {};
@ -215,7 +223,7 @@ function main(argv) {
});
// whether or not there was an error
fs.write("out/UNITTEST_RESULT_EXECUTIVE_SUMMARY.json", String(r.status));
fs.write(testOutputDirectory + "/UNITTEST_RESULT_EXECUTIVE_SUMMARY.json", String(r.status));
if (options.writeXmlReport) {
let j;
@ -226,8 +234,8 @@ function main(argv) {
j = inspect(r);
}
fs.write("out/UNITTEST_RESULT.json", j);
fs.write("out/UNITTEST_RESULT_CRASHED.json", String(r.crashed));
fs.write(testOutputDirectory + "/UNITTEST_RESULT.json", j);
fs.write(testOutputDirectory + "/UNITTEST_RESULT_CRASHED.json", String(r.crashed));
try {
resultsToXml(r,