summaryrefslogtreecommitdiff
path: root/src/mongo/embedded/mongo_embedded
diff options
context:
space:
mode:
authorBilly Donahue <billy.donahue@mongodb.com>2020-06-03 13:51:01 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-06-11 01:11:50 +0000
commitc08a726e61157ae501c28cf7e222e16d49954fbf (patch)
tree50e0cdc58f93a42dcba3a594051f9def44c457b8 /src/mongo/embedded/mongo_embedded
parentf664f948ad0876f0537958cb5ab29a857f1e4924 (diff)
downloadmongo-c08a726e61157ae501c28cf7e222e16d49954fbf.tar.gz
SERVER-48367 Remove all _envp usage
Diffstat (limited to 'src/mongo/embedded/mongo_embedded')
-rw-r--r--src/mongo/embedded/mongo_embedded/mongo_embedded_test.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mongo/embedded/mongo_embedded/mongo_embedded_test.cpp b/src/mongo/embedded/mongo_embedded/mongo_embedded_test.cpp
index a3755223912..9e5bfd7038f 100644
--- a/src/mongo/embedded/mongo_embedded/mongo_embedded_test.cpp
+++ b/src/mongo/embedded/mongo_embedded/mongo_embedded_test.cpp
@@ -658,9 +658,8 @@ int main(const int argc, const char* const* const argv) {
return EXIT_FAILURE;
}
- std::map<std::string, std::string> env;
ret = moe::OptionsParser().run(
- options, std::vector<std::string>(argv, argv + argc), env, &environment);
+ options, std::vector<std::string>(argv, argv + argc), &environment);
if (!ret.isOK()) {
std::cerr << options.helpString();
return EXIT_FAILURE;
@@ -683,8 +682,7 @@ int main(const int argc, const char* const* const argv) {
// The reason this works is that the unittest system relies on other systems being initialized
// through global init and deinitialize just deinitializes systems that explicitly supports
// deinit leaving the systems unittest needs initialized.
- const char* null_argv[1] = {nullptr};
- ret = mongo::runGlobalInitializers(0, null_argv, nullptr);
+ ret = mongo::runGlobalInitializers(std::vector<std::string>{});
if (!ret.isOK()) {
std::cerr << "Global initilization failed";
return EXIT_FAILURE;