summaryrefslogtreecommitdiff
path: root/SConscript.smoke
diff options
context:
space:
mode:
authorDan Crosta <dcrosta@10gen.com>2012-02-16 21:49:02 -0500
committerDan Crosta <dcrosta@10gen.com>2012-02-16 21:49:02 -0500
commit31991afed8aa8302d649b6079ab9c6dd0d52650c (patch)
tree7216abbc6af8ba5a8df982b40969a826c8edea95 /SConscript.smoke
parent7cf238c22c663ee87bcc2a5ff2416cd5cb41f5a4 (diff)
downloadmongo-31991afed8aa8302d649b6079ab9c6dd0d52650c.tar.gz
ALL smoke.py invocations are done through smoke_command()
This function returns a string command with fully qualified paths to a valid (>= 2.5) Python interpreter and to the smoke.py file.
Diffstat (limited to 'SConscript.smoke')
-rw-r--r--SConscript.smoke4
1 files changed, 3 insertions, 1 deletions
diff --git a/SConscript.smoke b/SConscript.smoke
index d05d3992da4..10e2462fa68 100644
--- a/SConscript.smoke
+++ b/SConscript.smoke
@@ -4,6 +4,7 @@
# e.g.)
import os
+from buildscripts import utils
Import( "has_option env shellEnv testEnv" )
@@ -42,7 +43,8 @@ def addSmoketest( name, deps ):
else:
target = name[5].lower() + name[6:]
- addTest(name, deps, [ "python buildscripts/smoke.py " + " ".join(smokeFlags) + ' ' + target ])
+ smokeArgs = smokeFlags + [target]
+ addTest(name, deps, utils.smoke_command(*smokeArgs))
addSmoketest( "smoke", [ add_exe( "test" ), add_exe( "mongod" ), add_exe( "mongo" ) ] )
addSmoketest( "smokePerf", [ add_exe("perftest") ] )