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:
Jan Steemann 2015-02-03 09:09:36 +01:00
parent c18ff7f300 bb13eb0b37
commit f22c6de040
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -413,7 +413,7 @@ function checkInstanceAlive(instanceInfo, options) {
instanceInfo.exitStatus = res;
print(instanceInfo);
if (res.hasOwnProperty('signal') &&
(res.signal === 11))
((ress.signal === 11) || (ress.signal === 6)))
{
storeArangodPath = "/var/tmp/arangod_" + instanceInfo.pid.pid;
print("Core dump written; copying arangod to " +
@ -437,7 +437,7 @@ function checkInstanceAlive(instanceInfo, options) {
var checkpid = instanceInfo.kickstarter.runInfo[part].pids[pid];
var ress = statusExternal(checkpid, false);
if (ress.hasOwnProperty('signal') &&
(ress.signal === 11)) {
((ress.signal === 11) || (ress.signal === 6))) {
storeArangodPath = "/var/tmp/arangod_" + checkpid.pid;
print("Core dump written; copying arangod to " +
storeArangodPath + " for later analysis.");
@ -1393,16 +1393,24 @@ testFuncs.dump = function (options) {
var results = {};
results.setup = runInArangosh(options, instanceInfo,
makePathUnix("js/server/tests/dump-setup"+cluster+".js"));
if (results.setup.status === true) {
if (checkInstanceAlive(instanceInfo, options) &&
(results.setup.status === true)) {
results.dump = runArangoDumpRestore(options, instanceInfo, "dump",
"UnitTestsDumpSrc");
results.restore = runArangoDumpRestore(options, instanceInfo, "restore",
"UnitTestsDumpDst");
results.test = runInArangosh(options, instanceInfo,
makePathUnix("js/server/tests/dump"+cluster+".js"),
[ "--server.database", "UnitTestsDumpDst" ]);
results.tearDown = runInArangosh(options, instanceInfo,
makePathUnix("js/server/tests/dump-teardown"+cluster+".js"));
if (checkInstanceAlive(instanceInfo, options)) {
results.restore = runArangoDumpRestore(options, instanceInfo, "restore",
"UnitTestsDumpDst");
if (checkInstanceAlive(instanceInfo, options)) {
results.test = runInArangosh(options, instanceInfo,
makePathUnix("js/server/tests/dump"+cluster+".js"),
[ "--server.database", "UnitTestsDumpDst" ]);
if (checkInstanceAlive(instanceInfo, options)) {
results.tearDown = runInArangosh(options, instanceInfo,
makePathUnix("js/server/tests/dump-teardown"+cluster+".js"));
}
}
}
}
print("Shutting down...");
shutdownInstance(instanceInfo,options);

3
scripts/run
View File

@ -27,7 +27,8 @@ if test $? -eq 0; then
echo removing log-$PID data-$PID
rm -rf log-$PID data-$PID
else
echo "failed - don't remove log-$PID data-$PID"
echo "failed - don't remove log-$PID data-$PID - heres the logfile:"
cat log-$PID
fi
echo Server has terminated.

6
scripts/unittest.js
View File

@ -156,4 +156,10 @@ function main (argv) {
}
UnitTest.unitTestPrettyPrintResults(r);
if (r.hasOwnProperty(crashed) && (r.crashed)) {
return -1;
}
else {
return 0;
}
}