diff options
Diffstat (limited to 'src/mongo/db/SConscript')
| -rw-r--r-- | src/mongo/db/SConscript | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 3fc627ea446..54445e732fd 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -234,7 +234,6 @@ env.CppUnitTest( 'logical_session_id_helpers', 'service_context', '$BUILD_DIR/mongo/db/auth/authmocks', - '$BUILD_DIR/mongo/db/service_context_noop_init', '$BUILD_DIR/mongo/unittest/concurrency', '$BUILD_DIR/mongo/util/clock_source_mock', ], @@ -499,8 +498,6 @@ env.Library( 'operation_context.cpp', 'operation_context_group.cpp', 'service_context.cpp', - 'service_context_noop.cpp', - 'service_context_registrar.cpp', 'server_recovery.cpp', 'unclean_shutdown.cpp', ], @@ -517,16 +514,6 @@ env.Library( ) env.Library( - target='service_context_noop_init', - source=[ - 'service_context_noop_init.cpp' - ], - LIBDEPS=[ - 'service_context', - ], -) - -env.Library( target='lasterror', source=[ "lasterror.cpp", @@ -598,9 +585,9 @@ env.CppUnitTest( LIBDEPS=[ '$BUILD_DIR/mongo/idl/idl_parser', "commands", - "service_context_noop_init", "auth/authmocks", "repl/replmocks", + "service_context_test_fixture", ], ) @@ -665,7 +652,6 @@ env.CppUnitTest( 'auth/authmocks', 'catalog/database_holder_mock', 'catalog_raii', - 'service_context_noop_init', 'stats/fill_locker_info', ], ) @@ -714,7 +700,6 @@ env.Library( env.Library( target="service_context_d", source=[ - "service_context_d.cpp", "service_entry_point_mongod.cpp", ], LIBDEPS=[ @@ -931,9 +916,9 @@ env.Library( source=[ 'exec/projection_exec_agg.cpp', ], - LIBDEPS_PRIVATE=[ - 'pipeline/parsed_aggregation_projection' - ] + LIBDEPS=[ + 'pipeline/parsed_aggregation_projection', + ], ) env.Library( @@ -1196,13 +1181,12 @@ envWithAsio.CppUnitTest( '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/db/auth/auth', '$BUILD_DIR/mongo/db/auth/authmocks', - '$BUILD_DIR/mongo/db/auth/authorization_session_for_test', - '$BUILD_DIR/mongo/db/service_context_noop_init', '$BUILD_DIR/mongo/transport/transport_layer_mock', 'logical_session_cache', 'logical_session_cache_impl', 'logical_session_id', 'logical_session_id_helpers', + 'service_context_test_fixture', 'service_liaison_mock', 'sessions_collection_mock', ], @@ -1398,7 +1382,6 @@ envWithAsio.CppUnitTest( 'logical_session_cache_test.cpp', ], LIBDEPS=[ - '$BUILD_DIR/mongo/db/service_context_noop_init', '$BUILD_DIR/mongo/executor/async_timer_mock', 'auth/authmocks', 'keys_collection_manager', @@ -1409,6 +1392,7 @@ envWithAsio.CppUnitTest( 'logical_session_cache', 'logical_session_cache_impl', 'service_liaison_mock', + 'service_context_test_fixture', 'sessions_collection_mock', ], ) @@ -1755,6 +1739,20 @@ env.CppUnitTest( ) env.Library( + target='service_context_test_fixture', + source=[ + 'service_context_test_fixture.cpp', + ], + LIBDEPS=[ + 'service_context', + '$BUILD_DIR/mongo/unittest/unittest', + ], + LIBDEPS_PRIVATE=[ + 'op_observer', + ], +) + +env.Library( target= 'service_context_d_test_fixture', source= [ 'service_context_d_test_fixture.cpp', @@ -1765,6 +1763,7 @@ env.Library( '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/unittest/unittest', 'service_context_d', + 'service_context_test_fixture', ], ) @@ -1776,12 +1775,11 @@ env.Library( LIBDEPS=[ # this library is required only because of SERVER-29908 '$BUILD_DIR/mongo/db/s/sharding_runtime_d', + 'service_context_d_test_fixture', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/auth/authmocks', '$BUILD_DIR/mongo/db/storage/devnull/storage_devnull', - '$BUILD_DIR/mongo/unittest/unittest', - 'service_context_d', ], ) @@ -1851,6 +1849,7 @@ asioEnv.CppIntegrationTest( ], LIBDEPS=[ '$BUILD_DIR/mongo/executor/network_interface_fixture', + '$BUILD_DIR/mongo/transport/transport_layer_egress_init', ], ) |