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

Relax cluster timeout when compiled with -DCOVERAGE

This commit is contained in:
Willi Goesgens 2015-02-26 11:01:53 +01:00
parent 8651e88d15
commit 2619529f63
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/common/bootstrap/module-internal.js
View File

@ -14,7 +14,7 @@
COLOR_OUTPUT_RESET, COLOR_BRIGHT, COLOR_BLACK, COLOR_BOLD_BLACK, COLOR_BLINK, COLOR_BLUE,
COLOR_BOLD_BLUE, COLOR_BOLD_GREEN, COLOR_RED, COLOR_BOLD_RED, COLOR_GREEN, COLOR_WHITE,
COLOR_BOLD_WHITE, COLOR_YELLOW, COLOR_BOLD_YELLOW, COLOR_CYAN, COLOR_BOLD_CYAN, COLOR_MAGENTA,
COLOR_BOLD_MAGENTA, PRETTY_PRINT, VALGRIND, VERSION,
COLOR_BOLD_MAGENTA, PRETTY_PRINT, VALGRIND, COVERAGE, VERSION,
BYTES_SENT_DISTRIBUTION, BYTES_RECEIVED_DISTRIBUTION, CONNECTION_TIME_DISTRIBUTION,
REQUEST_TIME_DISTRIBUTION, THREAD_NUMBER, LOGFILE_PATH,
SYS_PLATFORM, SYS_EXECUTE_EXTERNAL, SYS_STATUS_EXTERNAL, SYS_EXECUTE_EXTERNAL_AND_WAIT,
@ -164,6 +164,17 @@
delete VALGRIND;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief valgrind
////////////////////////////////////////////////////////////////////////////////
exports.coverage = false;
if (typeof COVERAGE !== "undefined") {
exports.coverage = COVERAGE;
delete COVERAGE;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief version
////////////////////////////////////////////////////////////////////////////////

4
js/server/modules/org/arangodb/cluster.js
View File

@ -175,6 +175,10 @@ function writeLocked (lockInfo, cb, args) {
if (ttl === undefined) {
ttl = 10;
}
if (require("internal").coverage) {
ttl *= 10;
timeout *= 10;
}
ArangoAgency.lockWrite(lockInfo.part, ttl, timeout);

5
lib/V8/v8-utils.cpp
View File

@ -4209,6 +4209,11 @@ void TRI_InitV8Utils (v8::Isolate* isolate,
TRI_AddGlobalVariableVocbase(isolate, context, TRI_V8_ASCII_STRING("STARTUP_PATH"), TRI_V8_STD_STRING(startupPath));
TRI_AddGlobalVariableVocbase(isolate, context, TRI_V8_ASCII_STRING("PATH_SEPARATOR"), TRI_V8_ASCII_STRING(TRI_DIR_SEPARATOR_STR));
TRI_AddGlobalVariableVocbase(isolate, context, TRI_V8_ASCII_STRING("VALGRIND"), RUNNING_ON_VALGRIND > 0 ? v8::True(isolate) : v8::False(isolate));
#ifdef COVERAGE
TRI_AddGlobalVariableVocbase(isolate, context, TRI_V8_ASCII_STRING("COVERAGE"), v8::True(isolate));
#else
TRI_AddGlobalVariableVocbase(isolate, context, TRI_V8_ASCII_STRING("COVERAGE"), v8::False(isolate));
#endif
TRI_AddGlobalVariableVocbase(isolate, context, TRI_V8_ASCII_STRING("VERSION"), TRI_V8_ASCII_STRING(TRI_VERSION));
TRI_AddGlobalVariableVocbase(isolate, context, TRI_V8_ASCII_STRING("CONNECTION_TIME_DISTRIBUTION"), DistributionList(isolate, TRI_ConnectionTimeDistributionVectorStatistics));