diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-01-17 17:40:35 -0500 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2018-03-07 14:01:39 -0500 |
| commit | 083647f38662195653b87b6a79ae1183d269f910 (patch) | |
| tree | 1cc2a3b7a036232da1a3c1bc96bc5c39d9d90551 /src/mongo/s/SConscript | |
| parent | 4d2ca242fb7b9a28d1123831db99664eb0db3e23 (diff) | |
| download | mongo-083647f38662195653b87b6a79ae1183d269f910.tar.gz | |
SERVER-29908 Move OpObserver callbacks out of CollectionShardingState
Diffstat (limited to 'src/mongo/s/SConscript')
| -rw-r--r-- | src/mongo/s/SConscript | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript index 7339848dac1..49ccc44ba4d 100644 --- a/src/mongo/s/SConscript +++ b/src/mongo/s/SConscript @@ -148,18 +148,28 @@ env.Library( ) env.Library( - target='sharding_test_fixture', + target='sharding_test_fixture_common', source=[ - 'sharding_test_fixture.cpp', + 'sharding_test_fixture_common.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/client/remote_command_targeter_mock', - '$BUILD_DIR/mongo/db/auth/authorization_manager_mock_init', + '$BUILD_DIR/mongo/executor/network_interface_mock', + '$BUILD_DIR/mongo/executor/network_test_env', + '$BUILD_DIR/mongo/executor/thread_pool_task_executor_test_fixture', + '$BUILD_DIR/mongo/unittest/unittest', + ], +) + +env.Library( + target='sharding_router_test_fixture', + source=[ + 'sharding_router_test_fixture.cpp', + ], + LIBDEPS=[ '$BUILD_DIR/mongo/db/query/collation/collator_factory_mock', '$BUILD_DIR/mongo/db/service_context_noop_init', - '$BUILD_DIR/mongo/executor/network_test_env', '$BUILD_DIR/mongo/executor/task_executor_pool', - '$BUILD_DIR/mongo/executor/thread_pool_task_executor_test_fixture', '$BUILD_DIR/mongo/s/catalog/dist_lock_manager_mock', '$BUILD_DIR/mongo/s/catalog/sharding_catalog_client_impl', '$BUILD_DIR/mongo/s/coreshard', @@ -167,6 +177,7 @@ env.Library( '$BUILD_DIR/mongo/util/clock_source_mock', 'sharding_egress_metadata_hook_for_mongos', 'sharding_task_executor', + 'sharding_test_fixture_common', ], ) @@ -176,20 +187,11 @@ env.Library( 'sharding_mongod_test_fixture.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/client/remote_command_targeter_mock', - '$BUILD_DIR/mongo/db/namespace_string', '$BUILD_DIR/mongo/db/op_observer_d', '$BUILD_DIR/mongo/db/repl/drop_pending_collection_reaper', '$BUILD_DIR/mongo/db/repl/replmocks', '$BUILD_DIR/mongo/db/service_context_d_test_fixture', - '$BUILD_DIR/mongo/executor/network_test_env', - '$BUILD_DIR/mongo/executor/task_executor_pool', - '$BUILD_DIR/mongo/executor/thread_pool_task_executor_test_fixture', - '$BUILD_DIR/mongo/rpc/metadata', - '$BUILD_DIR/mongo/s/catalog/dist_lock_manager_mock', - '$BUILD_DIR/mongo/s/catalog/sharding_catalog_client_impl', - '$BUILD_DIR/mongo/s/coreshard', - '$BUILD_DIR/mongo/util/clock_source_mock', + 'sharding_test_fixture_common', ], ) @@ -223,7 +225,7 @@ env.CppUnitTest( ], LIBDEPS=[ 'cluster_last_error_info', - 'sharding_test_fixture', + 'sharding_router_test_fixture', ], ) @@ -324,8 +326,6 @@ env.Library( 'sharding_egress_metadata_hook.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/audit', - '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/util/concurrency/thread_pool', 'grid', ], @@ -342,8 +342,8 @@ env.CppUnitTest( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/query/query_test_service_context', - '$BUILD_DIR/mongo/s/sharding_test_fixture', 'coreshard', + 'sharding_router_test_fixture', ] ) @@ -385,7 +385,7 @@ env.CppUnitTest( ], LIBDEPS=[ 'coreshard', - 'sharding_test_fixture', + 'sharding_router_test_fixture', ] ) @@ -396,7 +396,7 @@ env.CppUnitTest( ], LIBDEPS=[ 'coreshard', - 'sharding_test_fixture', + 'sharding_router_test_fixture', ] ) |