diff options
| author | Andy Schwerin <schwerin@mongodb.com> | 2018-04-24 18:44:21 -0400 |
|---|---|---|
| committer | Andy Schwerin <schwerin@mongodb.com> | 2018-05-02 17:10:28 -0400 |
| commit | 970ace98679d499f8821c8775dee875d3070d79f (patch) | |
| tree | e0d71af365887a0d16f0521c68d02ad908ed6000 /src/mongo/unittest/integration_test_main.cpp | |
| parent | 8ee6a9c1993acf7981d4d7a0ac8ba6f808c23b60 (diff) | |
| download | mongo-970ace98679d499f8821c8775dee875d3070d79f.tar.gz | |
SERVER-34794 Construct the global ServiceContext inside a MONGO_INITIALIZER
Diffstat (limited to 'src/mongo/unittest/integration_test_main.cpp')
| -rw-r--r-- | src/mongo/unittest/integration_test_main.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/mongo/unittest/integration_test_main.cpp b/src/mongo/unittest/integration_test_main.cpp index 382ea69b087..b4087176542 100644 --- a/src/mongo/unittest/integration_test_main.cpp +++ b/src/mongo/unittest/integration_test_main.cpp @@ -71,14 +71,7 @@ ConnectionString getFixtureConnectionString() { int main(int argc, char** argv, char** envp) { setupSynchronousSignalHandlers(); - - ::mongo::ServiceContext* serviceContext = nullptr; - if (::mongo::hasServiceContextFactory()) { - ::mongo::setGlobalServiceContext(::mongo::createServiceContext()); - serviceContext = ::mongo::getGlobalServiceContext(); - } - runGlobalInitializersOrDie(argc, argv, envp, serviceContext); - + runGlobalInitializersOrDie(argc, argv, envp); quickExit(unittest::Suite::run(std::vector<std::string>(), "", 1)); } |