diff options
| author | Dan Crosta <dcrosta@10gen.com> | 2012-03-20 10:22:08 -0400 |
|---|---|---|
| committer | Dan Crosta <dcrosta@10gen.com> | 2012-03-20 13:50:15 -0400 |
| commit | 2dc4657bfc7ca079a9076887652b5b01f644ac63 (patch) | |
| tree | 02e7411529aadbb7f16b7277e6b76ce97dcf52da /SConscript.smoke | |
| parent | 4b740e9f025daccd2c89981856b91fc28a15c21e (diff) | |
| download | mongo-2dc4657bfc7ca079a9076887652b5b01f644ac63.tar.gz | |
BUILDBOT-104 remove startMongod, add mongod dep for most tests
Diffstat (limited to 'SConscript.smoke')
| -rw-r--r-- | SConscript.smoke | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/SConscript.smoke b/SConscript.smoke index f6aee470f26..9dccc191c25 100644 --- a/SConscript.smoke +++ b/SConscript.smoke @@ -62,7 +62,7 @@ addSmoketest( "mongosTest", [ add_exe( 'mongos' ) ]) # These tests require the mongo shell if shellEnv is not None: - addSmoketest( "smokeJs", [add_exe("mongo")] ) + addSmoketest( "smokeJs", [add_exe("mongo"), add_exe("mongod")] ) addSmoketest( "smokeClone", [ add_exe("mongo"), add_exe("mongod") ] ) addSmoketest( "smokeRepl", [ add_exe("mongo"), add_exe("mongod"), add_exe("mongobridge") ] ) addSmoketest( "smokeReplSets", [ add_exe("mongo"), add_exe("mongod"), add_exe("mongobridge") ] ) @@ -71,24 +71,16 @@ if shellEnv is not None: addSmoketest( "smokeAuth", [ add_exe( "mongo" ), add_exe( "mongod" ) ] ) addSmoketest( "smokeParallel", [ add_exe( "mongo" ), add_exe( "mongod" ) ] ) addSmoketest( "smokeSharding", [ add_exe("mongo"), add_exe("mongod"), add_exe("mongos") ] ) - addSmoketest( "smokeJsPerf", [ add_exe("mongo") ] ) - addSmoketest( "smokeJsSlowNightly", [add_exe("mongo")]) - addSmoketest( "smokeJsSlowWeekly", [add_exe("mongo")]) - addSmoketest( "smokeQuota", [ add_exe("mongo") ] ) + addSmoketest( "smokeJsPerf", [ add_exe("mongo"), add_exe("mongod") ] ) + addSmoketest( "smokeJsSlowNightly", [add_exe("mongo"), add_exe("mongod")]) + addSmoketest( "smokeJsSlowWeekly", [add_exe("mongo"), add_exe("mongod")]) + addSmoketest( "smokeQuota", [ add_exe("mongo"), add_exe("mongod") ] ) addSmoketest( "smokeTool", [ add_exe( "mongo" ), add_exe("mongod"), add_exe("mongos"), "tools" ] ) addSmoketest( "smokeAggregation", [ add_exe( "mongo" ), add_exe( "mongod" ) ] ) addSmoketest( "smokeFailingTests", [ add_exe( "mongo" ), add_exe( "mongod" ) ], ['--only-old-fails', '--continue-on-failure'] ) addSmoketest( "smokeResetFails", [ add_exe( "mongo" ), add_exe( "mongod" ) ], ['--reset-old-fails'] ) -# Note: although the test running logic has been moved to -# buildscripts/smoke.py, the interface to running the tests has been -# something like 'scons startMongod <suite>'; startMongod is now a -# no-op, and should go away eventually. -smokeEnv.Alias( "startMongod", [add_exe("mongod")]); -smokeEnv.AlwaysBuild( "startMongod" ); -smokeEnv.SideEffect( "dummySmokeSideEffect", "startMongod" ) - smokeEnv.Alias( "startMongodSmallOplog", [add_exe("mongod")], [] ); smokeEnv.AlwaysBuild( "startMongodSmallOplog" ); smokeEnv.SideEffect( "dummySmokeSideEffect", "startMongodSmallOplog" ) |