mirror of
https://github.com/mongodb/mongo.git
synced 2024-12-01 09:32:32 +01:00
allow sharding and rs tests to respect smoke --nopreallocj setting
This commit is contained in:
parent
5bd4f5885c
commit
16955912bc
@ -81,6 +81,7 @@ startMongodTest = function (port, dirname, restart, extraOptions ) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if( jsTestOptions().noJournal ) options["nojournal"] = ""
|
if( jsTestOptions().noJournal ) options["nojournal"] = ""
|
||||||
|
if( jsTestOptions().noJournalPrealloc ) options["nopreallocj"] = ""
|
||||||
|
|
||||||
if ( extraOptions )
|
if ( extraOptions )
|
||||||
Object.extend( options , extraOptions );
|
Object.extend( options , extraOptions );
|
||||||
@ -920,6 +921,7 @@ ReplTest.prototype.getOptions = function( master , extra , putBinaryFirst, norep
|
|||||||
a.push( this.getPath( master ) );
|
a.push( this.getPath( master ) );
|
||||||
|
|
||||||
if( jsTestOptions().noJournal ) a.push( "--nojournal" )
|
if( jsTestOptions().noJournal ) a.push( "--nojournal" )
|
||||||
|
if( jsTestOptions().noJournalPrealloc ) a.push( "--nopreallocj" )
|
||||||
|
|
||||||
if ( !norepl ) {
|
if ( !norepl ) {
|
||||||
if ( master ){
|
if ( master ){
|
||||||
@ -1228,7 +1230,8 @@ ReplSetTest.prototype.getOptions = function( n , extra , putBinaryFirst ){
|
|||||||
a.push( "--dbpath" );
|
a.push( "--dbpath" );
|
||||||
a.push( this.getPath( ( n.host ? this.getNodeId( n ) : n ) ) );
|
a.push( this.getPath( ( n.host ? this.getNodeId( n ) : n ) ) );
|
||||||
|
|
||||||
if( jsTestOptions.noJournal ) a.push( "--nojournal" )
|
if( jsTestOptions().noJournal ) a.push( "--nojournal" )
|
||||||
|
if( jsTestOptions().noJournalPrealloc ) a.push( "--nopreallocj" )
|
||||||
|
|
||||||
for ( var k in extra ){
|
for ( var k in extra ){
|
||||||
var v = extra[k];
|
var v = extra[k];
|
||||||
|
@ -970,7 +970,8 @@ jsTestPath = function(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
jsTestOptions = function(){
|
jsTestOptions = function(){
|
||||||
if( TestData ) return { noJournal : TestData.noJournal }
|
if( TestData ) return { noJournal : TestData.noJournal,
|
||||||
|
noJournalPrealloc : TestData.noJournalPrealloc }
|
||||||
return {}
|
return {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user