diff options
| author | Andrew Morrow <acm@mongodb.com> | 2014-04-23 12:08:55 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2014-07-12 16:50:51 -0400 |
| commit | ef4f60e3951929a7b16cf8920216310ecc58cc49 (patch) | |
| tree | 8e7c6419f6399fcf65a27e3536ce8b43f7702d05 /SConscript.smoke | |
| parent | f6a6dec8f14ef75980d1512bb6d5e30fab6b73db (diff) | |
| download | mongo-ef4f60e3951929a7b16cf8920216310ecc58cc49.tar.gz | |
SERVER-14343 leaner include paths
Diffstat (limited to 'SConscript.smoke')
| -rw-r--r-- | SConscript.smoke | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/SConscript.smoke b/SConscript.smoke index 04caf4ed0c0..0710dcbb8d4 100644 --- a/SConscript.smoke +++ b/SConscript.smoke @@ -6,12 +6,12 @@ import os from buildscripts import utils -Import( "has_option env shellEnv testEnv" ) +Import( "has_option env" ) def add_exe( v ): return "${PROGPREFIX}%s${PROGSUFFIX}" % v -smokeEnv = testEnv.Clone() +smokeEnv = env.Clone() smokeEnv['ENV']['PATH']=os.environ['PATH'] # copy in any envrionment variables beginning with MONGO_; these @@ -73,7 +73,7 @@ addSmoketest( "mongosTest", [ add_exe( 'mongos' ) ]) addSmokeSuite( "smokeCppUnittests", "$UNITTEST_LIST" ) # These tests require the mongo shell -if shellEnv is not None: +if not has_option('noshell'): addSmoketest( "smokeJs", [add_exe("mongo"), add_exe("mongod")] ) addSmoketest( "smokeJsCore", [add_exe("mongo"), add_exe("mongod")] ) addSmoketest( "smokeClone", [ add_exe("mongo"), add_exe("mongod") ] ) |