diff options
| author | Andrew Morrow <acm@mongodb.com> | 2016-03-13 15:22:43 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2016-03-21 22:55:32 -0400 |
| commit | 6877d732e6d5739f9526d89d8e1360c08672eda7 (patch) | |
| tree | 83552e1461ce9d62f667e2a0c81ca8350361d565 /src/mongo/db/SConscript | |
| parent | d5dce08c36ab4a928c5345ee18c57327234940f1 (diff) | |
| download | mongo-6877d732e6d5739f9526d89d8e1360c08672eda7.tar.gz | |
SERVER-23103 Make libcommand not depend on libcurop
Diffstat (limited to 'src/mongo/db/SConscript')
| -rw-r--r-- | src/mongo/db/SConscript | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index c7ae1d3ac1c..ce10e87b829 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -151,6 +151,7 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/bson/mutable/mutable_bson', + '$BUILD_DIR/mongo/db/commands', '$BUILD_DIR/mongo/db/concurrency/lock_manager', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/mongo/db/query/command_request_response', @@ -166,7 +167,9 @@ env.CppUnitTest( 'curop_test.cpp', ], LIBDEPS=[ + 'auth/authorization_manager_mock_init', 'curop', + 'commands_test_crutch', ], ) @@ -373,6 +376,8 @@ env.CppUnitTest( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/repl/replmocks', + 'auth/authorization_manager_mock_init', + 'commands_test_crutch', 'common', 'range_deleter', ], @@ -489,7 +494,6 @@ env.Library( 'auth/authorization_manager_global', 'commands/server_status_core', 'commands/test_commands_enabled', - 'curop', 'service_context', ], LIBDEPS_TAGS=[ @@ -499,6 +503,32 @@ env.Library( ], ) +env.Library( + target="commands_test_crutch", + source=[ + "commands_test_crutch.cpp", + ], + LIBDEPS=[ + "commands", + ], +) + +env.Library( + target='run_commands', + source=[ + 'run_commands.cpp', + ], + LIBDEPS=[ + "commands", + "curop", + ], + LIBDEPS_TAGS=[ + # Dependency on Command::execCommand, which is not uniquely + # defined. + 'incomplete', + ], +) + # mongod files - also files used in tools. present in dbtests, but not in mongos and not in client # libs. serverOnlyFiles = [ @@ -678,6 +708,7 @@ serveronlyLibdeps = [ "repl/rslog", "repl/sync_tail", "repl/topology_coordinator_impl", + "run_commands", "s/commands", "s/metadata", "s/sharding", |