diff options
| author | Apollon Oikonomopoulos <apoikos@debian.org> | 2016-01-14 00:10:06 +0200 |
|---|---|---|
| committer | Apollon Oikonomopoulos <apollon@skroutz.gr> | 2016-01-14 00:10:06 +0200 |
| commit | 374e1947abcd3e127a2a613aff73ecffdb9199ea (patch) | |
| tree | d83973c3c9802450acd5b5e86fe0d4e8e60a3a1b /SConscript.smoke | |
| parent | 65585c90b12d6523bea75a2aebaae2a2fdf9e641 (diff) | |
Imported Upstream version 2.6.11upstream/2.6.11
Diffstat (limited to 'SConscript.smoke')
| -rw-r--r-- | SConscript.smoke | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/SConscript.smoke b/SConscript.smoke index 8d2eb873bd6..ab233477cf2 100644 --- a/SConscript.smoke +++ b/SConscript.smoke @@ -69,21 +69,6 @@ def addSmokeSuite( name, suitefile, needMongod=False ): addSmoketest( "smoke", [ add_exe( "test" ), add_exe( "mongod" ), add_exe( "mongo" ) ] ) addSmoketest( "smokePerf", [ add_exe("perftest") ] ) -smokeClientDeps = [ - add_exe('firstExample'), - add_exe('rsExample'), - add_exe('secondExample'), - add_exe('whereExample'), - add_exe('authTest'), - add_exe('httpClientTest'), - add_exe('clientTest'), -] -if has_option("sharedclient"): - smokeClientDeps += [ "sharedclient/" + name for name in smokeClientDeps ] -smokeClientDeps += [add_exe('bsondemo')] -smokeClientDeps += [add_exe('mongod'), add_exe('mongo')] -smokeClient = addSmoketest( "smokeClient", smokeClientDeps ) - addSmoketest( "mongosTest", [ add_exe( 'mongos' ) ]) addSmokeSuite( "smokeCppUnittests", "$UNITTEST_LIST" ) addSmokeSuite( "smokeModuleTests", "$MODULETEST_LIST" ) @@ -91,6 +76,7 @@ addSmokeSuite( "smokeModuleTests", "$MODULETEST_LIST" ) # These tests require the mongo shell if shellEnv is not None: addSmoketest( "smokeJs", [add_exe("mongo"), add_exe("mongod")] ) + addSmoketest( "smokeJsCore", [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") ] ) @@ -100,14 +86,17 @@ if shellEnv is not None: addSmoketest( "smokeParallel", [ add_exe( "mongo" ), add_exe( "mongod" ) ] ) addSmoketest( "smokeSharding", [ add_exe("mongo"), add_exe("mongod"), add_exe("mongos"), add_exe('mongofiles') ] ) addSmoketest( "smokeJsPerf", [ add_exe("mongo"), add_exe("mongod") ] ) - addSmoketest( "smokeJsSlowNightly", [add_exe("mongo"), add_exe("mongod"), add_exe("mongos") ]) - addSmoketest( "smokeJsSlowWeekly", [add_exe("mongo"), add_exe("mongod"), add_exe("mongos") ]) + addSmoketest( "smokeNoPassthroughWithMongod", [add_exe("mongo"), add_exe("mongod"), add_exe("mongos") ]) + addSmoketest( "smokeNoPassthrough", [add_exe("mongo"), add_exe("mongod"), add_exe("mongos") ]) + addSmoketest( "smokeSlow1", [add_exe("mongo"), add_exe("mongod"), add_exe("mongos") ]) + addSmoketest( "smokeSlow2", [add_exe("mongo"), add_exe("mongod"), add_exe("mongos") ]) 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" ), add_exe( "mongos" ) ] ) addSmoketest( "smokeMultiVersion", [ add_exe( "mongo" ), add_exe( "mongod" ), add_exe( "mongos" ) ] ) addSmoketest( "smokeFailPoint", [ add_exe( "mongo" ), add_exe( "mongod" ), add_exe( "mongos" ) ] ) - addSmoketest( "smokeSsl", [ add_exe("mongo"), add_exe("mongod"), add_exe("mongos") ], ['--use-ssl'] ) + addSmoketest( "smokeSsl", [ add_exe("mongo"), add_exe("mongod"), add_exe("mongos"), "tools" ], + ['--use-ssl','--use-x509'] ) 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'] ) @@ -117,7 +106,7 @@ smokeEnv.AlwaysBuild( "startMongodSmallOplog" ); smokeEnv.SideEffect( "dummySmokeSideEffect", "startMongodSmallOplog" ) def addMongodReqTargets( env, target, source ): - mongodReqTargets = [ "smokeClient", "smokeJs" ] + mongodReqTargets = [ "smokeJs" ] for target in mongodReqTargets: smokeEnv.Depends( target, "startMongod" ) smokeEnv.Depends( "smokeAll", target ) @@ -129,7 +118,7 @@ smokeEnv.Alias( "smokeAll", [ "smoke", "mongosTest", "smokeClone", "smokeRepl", smokeEnv.AlwaysBuild( "smokeAll" ) def addMongodReqNoJsTargets( env, target, source ): - mongodReqTargets = [ "smokeClient" ] + mongodReqTargets = [] for target in mongodReqTargets: smokeEnv.Depends( target, "startMongod" ) smokeEnv.Depends( "smokeAllNoJs", target ) |