summaryrefslogtreecommitdiff
path: root/buildscripts/smoke.py
diff options
context:
space:
mode:
authorJonathan <jonathan@mongodb.com>2014-07-24 13:22:27 -0400
committerBenety Goh <benety@mongodb.com>2014-07-25 00:43:55 -0400
commitd5522fbaa3aa3fb9eef81fa20d74f3689c0088ef (patch)
treed45b75227ecd1882b9ca61e303056a21e65ce060 /buildscripts/smoke.py
parent3bb266f9c6dfb35e7eae73731f2cad2794e39417 (diff)
downloadmongo-d5522fbaa3aa3fb9eef81fa20d74f3689c0088ef.tar.gz
SERVER-14652 update tests for localhost exception
Closes #721 Signed-off-by: Benety Goh <benety@mongodb.com>
Diffstat (limited to 'buildscripts/smoke.py')
-rwxr-xr-xbuildscripts/smoke.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py
index c39d5d61ea4..4472e07f12b 100755
--- a/buildscripts/smoke.py
+++ b/buildscripts/smoke.py
@@ -539,6 +539,8 @@ def runTest(test, result):
# this updates the default data directory for mongod processes started through shell (src/mongo/shell/servers.js)
evalString += 'MongoRunner.dataDir = "' + os.path.abspath(smoke_db_prefix + '/data/db') + '";'
evalString += 'MongoRunner.dataPath = MongoRunner.dataDir + "/";'
+ if temp_path:
+ evalString += 'TestData.tmpPath = "' + temp_path + '";'
if os.sys.platform == "win32":
# double quotes in the evalString on windows; this
# prevents the backslashes from being removed when
@@ -550,6 +552,7 @@ def runTest(test, result):
argv = argv + [ '--eval', evalString]
+
if argv[0].endswith( 'dbtest' ) or argv[0].endswith( 'dbtest.exe' ):
if no_preallocj :
argv = argv + [ '--nopreallocj' ]
@@ -1204,7 +1207,7 @@ def main():
parser.add_option('--set-parameters-mongos', dest='set_parameters_mongos', default="",
help='Adds --setParameter to mongos for each passed in item in the csv list - ex. "param1=1,param2=foo" ')
parser.add_option('--temp-path', dest='temp_path', default=None,
- help='If present, passed as --tempPath to unittests and dbtests')
+ help='If present, passed as --tempPath to unittests and dbtests or TestData.tmpPath to mongo')
# Buildlogger invocation from command line
parser.add_option('--buildlogger-builder', dest='buildlogger_builder', default=None,
action="store", help='Set the "builder name" for buildlogger')