SERVER-16113 Add additional WT options to smoke.py and jstests

This change adds --wiredTigerCollectionConfig and
--wiredTigerIndexConfig in exactly the same way that
--wiredTigerEngineConfig was previously added.

1 files changed, 37 insertions, 13 deletions

diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py
index b061cc9515c..d7319a78804 100755
--- a/buildscripts/smoke.py
+++ b/buildscripts/smoke.py
@@ -226,8 +226,12 @@ class mongod(NullMongod):
             argv += ["--master", "--oplogSize", "511"]
         if self.kwargs.get('storage_engine'):
             argv += ["--storageEngine", self.kwargs.get('storage_engine')]
-        if self.kwargs.get('wiredtiger_engineconfig'):
-            argv += ["--wiredTigerEngineConfig", self.kwargs.get('wiredtiger_engineconfig')]
+        if self.kwargs.get('wiredtiger_engine_config'):
+            argv += ["--wiredTigerEngineConfig", self.kwargs.get('wiredtiger_engine_config')]
+        if self.kwargs.get('wiredtiger_collection_config'):
+            argv += ["--wiredTigerCollectionConfig", self.kwargs.get('wiredtiger_collection_config')]
+        if self.kwargs.get('wiredtiger_index_config'):
+            argv += ["--wiredTigerIndexConfig", self.kwargs.get('wiredtiger_index_config')]
         params = self.kwargs.get('set_parameters', None)
         if params:
             for p in params.split(','): argv += ['--setParameter', p]
@@ -534,8 +538,12 @@ def runTest(test, result):
 
             if storage_engine:
                 argv.extend(["--storageEngine", storage_engine])
-            if wiredtiger_engineconfig:
-                argv.extend(["--wiredTigerEngineConfig", wiredtiger_engineconfig])
+            if wiredtiger_engine_config:
+                argv.extend(["--wiredTigerEngineConfig", wiredtiger_engine_config])
+            if wiredtiger_collection_config:
+                argv.extend(["--wiredTigerCollectionConfig", wiredtiger_collection_config])
+            if wiredtiger_index_config:
+                argv.extend(["--wiredTigerIndexConfig", wiredtiger_index_config])
 
         # more blech
         elif os.path.basename(path) in ['mongos', 'mongos.exe']:
@@ -559,7 +567,9 @@ def runTest(test, result):
     if ( argv[0].endswith( 'mongo' ) or argv[0].endswith( 'mongo.exe' ) ) and not '--eval' in argv :
         evalString = 'TestData = new Object();' + \
                      'TestData.storageEngine = "' + ternary( storage_engine, storage_engine, "" ) + '";' + \
-                     'TestData.wiredTigerEngineConfig = "' + ternary( wiredtiger_engineconfig, wiredtiger_engineconfig, "" ) + '";' + \
+                     'TestData.wiredTigerEngineConfig = "' + ternary( wiredtiger_engine_config, wiredtiger_engine_config, "" ) + '";' + \
+                     'TestData.wiredTigerCollectionConfig = "' + ternary( wiredtiger_collection_config, wiredtiger_collection_config, "" ) + '";' + \
+                     'TestData.wiredTigerIndexConfig = "' + ternary( wiredtiger_index_config, wiredtiger_index_config, "" ) + '";' + \
                      'TestData.testPath = "' + path + '";' + \
                      'TestData.testFile = "' + os.path.basename( path ) + '";' + \
                      'TestData.testName = "' + re.sub( ".js$", "", os.path.basename( path ) ) + '";' + \
@@ -677,7 +687,9 @@ def run_tests(tests):
                             small_oplog=small_oplog,
                             no_journal=no_journal,
                             storage_engine=storage_engine,
-                            wiredtiger_engineconfig=wiredtiger_engineconfig,
+                            wiredtiger_engine_config=wiredtiger_engine_config,
+                            wiredtiger_collection_config=wiredtiger_collection_config,
+                            wiredtiger_index_config=wiredtiger_index_config,
                             set_parameters=set_parameters,
                             no_preallocj=no_preallocj,
                             auth=auth,
@@ -690,7 +702,9 @@ def run_tests(tests):
         if small_oplog:
             slave = mongod(slave=True,
                            storage_engine=storage_engine,
-                           wiredtiger_engineconfig=wiredtiger_engineconfig,
+                           wiredtiger_engine_config=wiredtiger_engine_config,
+                           wiredtiger_collection_config=wiredtiger_collection_config,
+                           wiredtiger_index_config=wiredtiger_index_config,
                            set_parameters=set_parameters)
             slave.start()
         elif small_oplog_rs:
@@ -699,7 +713,9 @@ def run_tests(tests):
                            small_oplog=small_oplog,
                            no_journal=no_journal,
                            storage_engine=storage_engine,
-                           wiredtiger_engineconfig=wiredtiger_engineconfig,
+                           wiredtiger_engine_config=wiredtiger_engine_config,
+                           wiredtiger_collection_config=wiredtiger_collection_config,
+                           wiredtiger_index_config=wiredtiger_index_config,
                            set_parameters=set_parameters,
                            no_preallocj=no_preallocj,
                            auth=auth,
@@ -767,7 +783,9 @@ def run_tests(tests):
                                         small_oplog=small_oplog,
                                         no_journal=no_journal,
                                         storage_engine=storage_engine,
-                                        wiredtiger_engineconfig=wiredtiger_engineconfig,
+                                        wiredtiger_engine_config=wiredtiger_engine_config,
+                                        wiredtiger_collection_config=wiredtiger_collection_config,
+                                        wiredtiger_index_config=wiredtiger_index_config,
                                         set_parameters=set_parameters,
                                         no_preallocj=no_preallocj,
                                         auth=auth,
@@ -1053,7 +1071,7 @@ def add_exe(e):
 def set_globals(options, tests):
     global mongod_executable, mongod_port, shell_executable, continue_on_failure
     global small_oplog, small_oplog_rs
-    global no_journal, set_parameters, set_parameters_mongos, no_preallocj, storage_engine, wiredtiger_engineconfig
+    global no_journal, set_parameters, set_parameters_mongos, no_preallocj, storage_engine, wiredtiger_engine_config, wiredtiger_collection_config, wiredtiger_index_config
     global auth, authMechanism, keyFile, keyFileData, smoke_db_prefix, test_path, start_mongod
     global use_ssl, use_x509
     global file_of_commands_mode
@@ -1088,7 +1106,9 @@ def set_globals(options, tests):
         small_oplog_rs = options.small_oplog_rs
     no_journal = options.no_journal
     storage_engine = options.storage_engine
-    wiredtiger_engineconfig = options.wiredtiger_engineconfig
+    wiredtiger_engine_config = options.wiredtiger_engine_config
+    wiredtiger_collection_config = options.wiredtiger_collection_config
+    wiredtiger_index_config = options.wiredtiger_index_config
     set_parameters = options.set_parameters
     set_parameters_mongos = options.set_parameters_mongos
     no_preallocj = options.no_preallocj
@@ -1203,7 +1223,7 @@ def add_to_failfile(tests, options):
 
 def main():
     global mongod_executable, mongod_port, shell_executable, continue_on_failure, small_oplog
-    global no_journal, set_parameters, set_parameters_mongos, no_preallocj, auth, storage_engine, wiredtiger_engineconfig
+    global no_journal, set_parameters, set_parameters_mongos, no_preallocj, auth, storage_engine, wiredtiger_engine_config, wiredtiger_collection_config, wiredtiger_index_config
     global keyFile, smoke_db_prefix, test_path, use_write_commands
 
     try:
@@ -1241,8 +1261,12 @@ def main():
                       help='Run tests with replica set replication & use a small oplog')
     parser.add_option('--storageEngine', dest='storage_engine', default=None,
                       help='What storage engine to start mongod with')
-    parser.add_option('--wiredTigerEngineConfig', dest='wiredtiger_engineconfig', default=None,
+    parser.add_option('--wiredTigerEngineConfig', dest='wiredtiger_engine_config', default=None,
                       help='Wired Tiger configuration to pass through to mongod')
+    parser.add_option('--wiredTigerCollectionConfig', dest='wiredtiger_collection_config', default=None,
+                      help='Wired Tiger collection configuration to pass through to mongod')
+    parser.add_option('--wiredTigerIndexConfig', dest='wiredtiger_index_config', default=None,
+                      help='Wired Tiger index configuration to pass through to mongod')
     parser.add_option('--nojournal', dest='no_journal', default=False,
                       action="store_true",
                       help='Do not turn on journaling in tests')