allow test not to preallocate journal files

2 files changed, 10 insertions, 0 deletions

diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py
index 1078574b2c0..c46b5d1879d 100755
--- a/buildscripts/smoke.py
+++ b/buildscripts/smoke.py
@@ -292,6 +292,11 @@ def runTest(test):
                                   'TestData.testName = "' + re.sub( ".js$", "", os.path.basename( path ) ) + '";' + 
                                   'TestData.noJournal = ' + ( 'true' if no_journal else 'false' )  + ";" +
                                   'TestData.noJournalPrealloc = ' + ( 'true' if no_preallocj else 'false' )  + ";" ]
+    
+    if argv[0].endswith( 'test' ) and no_preallocj :
+        argv = argv + [ '--nopreallocj' ]
+    
+    
     print argv
     r = call(argv, cwd=test_path)
     t2 = time.time()
diff --git a/dbtests/framework.cpp b/dbtests/framework.cpp
index 99fcad51d97..95ed8b33668 100644
--- a/dbtests/framework.cpp
+++ b/dbtests/framework.cpp
@@ -209,6 +209,7 @@ namespace mongo {
 
             hidden_options.add_options()
             ("suites", po::value< vector<string> >(), "test suites to run")
+            ("nopreallocj", "disable journal prealloc")
             ;
 
             positional_options.add("suites", -1);
@@ -247,6 +248,10 @@ namespace mongo {
                 cmdLine.dur = true;
             }
 
+            if( params.count("nopreallocj") ) {
+                cmdLine.preallocj = false;
+            }
+
             if (params.count("debug") || params.count("verbose") ) {
                 logLevel = 1;
             }