SERVER-36258 Construct ServiceContext after mongo initializers complete.

3 files changed, 5 insertions, 0 deletions

diff --git a/src/mongo/unittest/SConscript b/src/mongo/unittest/SConscript
index e3593d9ff8b..1193b6d2b07 100644
--- a/src/mongo/unittest/SConscript
+++ b/src/mongo/unittest/SConscript
@@ -46,6 +46,7 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/client/connection_string',
+        '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/mongo/util/options_parser/options_parser_init',
     ],
 )
@@ -59,6 +60,7 @@ bmEnv.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/third_party/shim_benchmark',
     ],
 )
diff --git a/src/mongo/unittest/benchmark_main.cpp b/src/mongo/unittest/benchmark_main.cpp
index a29168ad5d5..8029a4005fa 100644
--- a/src/mongo/unittest/benchmark_main.cpp
+++ b/src/mongo/unittest/benchmark_main.cpp
@@ -34,6 +34,7 @@
 
 #include "mongo/base/initializer.h"
 #include "mongo/config.h"
+#include "mongo/db/service_context.h"
 #include "mongo/util/log.h"
 #include "mongo/util/signal_handlers_synchronous.h"
 
@@ -43,6 +44,7 @@ int main(int argc, char** argv, char** envp) {
     ::mongo::setupSynchronousSignalHandlers();
 
     ::mongo::runGlobalInitializersOrDie(argc, argv, envp);
+    ::mongo::setGlobalServiceContext(::mongo::ServiceContext::make());
 
     // Copied from the BENCHMARK_MAIN macro.
     ::benchmark::Initialize(&argc, argv);
diff --git a/src/mongo/unittest/integration_test_main.cpp b/src/mongo/unittest/integration_test_main.cpp
index b2e3168bccc..20d2d8e0546 100644
--- a/src/mongo/unittest/integration_test_main.cpp
+++ b/src/mongo/unittest/integration_test_main.cpp
@@ -71,6 +71,7 @@ ConnectionString getFixtureConnectionString() {
 int main(int argc, char** argv, char** envp) {
     setupSynchronousSignalHandlers();
     runGlobalInitializersOrDie(argc, argv, envp);
+    setGlobalServiceContext(ServiceContext::make());
     quickExit(unittest::Suite::run(std::vector<std::string>(), "", 1));
 }