diff options
| author | Andrew Morrow <acm@10gen.com> | 2013-06-04 16:13:50 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@10gen.com> | 2013-06-04 16:16:08 -0400 |
| commit | 5316bea80670d924ec2d0cc3906d026882b24951 (patch) | |
| tree | 84a830b418d00c88cdcb6366305913a86712fd80 /SConscript.smoke | |
| parent | 3ec04acb1a7183b30533678e745a920389ec8d91 (diff) | |
| download | mongo-5316bea80670d924ec2d0cc3906d026882b24951.tar.gz | |
SERVER-6514 Re-add support for building the C++ driver shared library
Primarily a backport of da8c0fa929eeb03dbe3fb0533874de31da0bc8c8, with
the following SERVER-6514 fixups patches from master rolled in as well:
680f0bf57260bf020cfaeb35598861c6b89524cb
48f8431210aba4de7d108852bc1d87267237d358
Diffstat (limited to 'SConscript.smoke')
| -rw-r--r-- | SConscript.smoke | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/SConscript.smoke b/SConscript.smoke index 3dbef68dee0..8d2eb873bd6 100644 --- a/SConscript.smoke +++ b/SConscript.smoke @@ -68,16 +68,22 @@ def addSmokeSuite( name, suitefile, needMongod=False ): addSmoketest( "smoke", [ add_exe( "test" ), add_exe( "mongod" ), add_exe( "mongo" ) ] ) addSmoketest( "smokePerf", [ add_exe("perftest") ] ) -addSmoketest( "smokeClient", [ - add_exe('firstExample'), - add_exe('rsExample'), - add_exe('secondExample'), - add_exe('whereExample'), - add_exe('authTest'), - add_exe('httpClientTest'), - add_exe('bsondemo'), - add_exe('clientTest'), - ] ) + +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" ) |