diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | buildscripts/bypass_compile_and_fetch_binaries.py | 2 | ||||
| -rw-r--r-- | etc/evergreen.yml | 10 | ||||
| -rw-r--r-- | src/mongo/embedded/SConscript | 10 | ||||
| -rw-r--r-- | src/mongo/embedded/mongoed_main.cpp (renamed from src/mongo/embedded/mongoe_main.cpp) | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore index 009ae7e839f..2db92b85522 100644 --- a/.gitignore +++ b/.gitignore @@ -77,7 +77,7 @@ scratch /mongo /mongobridge /mongod -/mongoe +/mongoed /mongogrid /mongoperf /mongos diff --git a/buildscripts/bypass_compile_and_fetch_binaries.py b/buildscripts/bypass_compile_and_fetch_binaries.py index 9cad905c624..4bf307c8feb 100644 --- a/buildscripts/bypass_compile_and_fetch_binaries.py +++ b/buildscripts/bypass_compile_and_fetch_binaries.py @@ -269,7 +269,7 @@ def main(): # pylint: disable=too-many-locals,too-many-statements extract_files = [ executable_name("dbtest"), executable_name("mongobridge"), - executable_name("mongoe"), + executable_name("mongoed"), "build/integration_tests.txt", ] with tarfile.open(filename, "r:gz") as tar: diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 944b770d198..8d7a7e932c8 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -2944,7 +2944,7 @@ tasks: - "./test*" - "./dbtest*" - "./mongobridge*" - - "./mongoe*" + - "./mongoed*" - "buildscripts/**" - "*Example" - "*Test" @@ -4123,7 +4123,7 @@ tasks: - func: "do setup" - func: "run tests" vars: - resmoke_args: --suites=core --mongod=./mongoe --excludeWithAnyTags=requires_scripting,requires_auth,requires_sharding,does_not_support_stepdowns,requires_eval_command,requires_background_index,incompatible_with_embedded,incompatible_with_embedded_todo_investigate,requires_replication,SERVER-32997 + resmoke_args: --suites=core --mongod=./mongoed --excludeWithAnyTags=requires_scripting,requires_auth,requires_sharding,does_not_support_stepdowns,requires_eval_command,requires_background_index,incompatible_with_embedded,incompatible_with_embedded_todo_investigate,requires_replication,SERVER-32997 run_multiple_jobs: true - <<: *task_template @@ -11602,7 +11602,7 @@ buildvariants: gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go' tooltags: "-tags 'ssl sasl'" build_mongoreplay: true - additional_targets: mongoe + additional_targets: mongoed display_tasks: - *unittests tasks: @@ -11669,7 +11669,7 @@ buildvariants: gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go' tooltags: -gccgoflags "$(pkg-config --libs --cflags libssl libcrypto libsasl2)" -tags 'sasl ssl' build_mongoreplay: true - additional_targets: mongoe + additional_targets: mongoed display_tasks: - *unittests tasks: @@ -11760,7 +11760,7 @@ buildvariants: gorootvars: 'PATH="/usr/local/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/usr/local/go1.8/go CGO_CPPFLAGS=-I/opt/mongodbtoolchain/v2/include CGO_CFLAGS=-mmacosx-version-min=10.10 CGO_LDFLAGS=-mmacosx-version-min=10.10' tooltags: "-tags 'ssl sasl openssl_pre_1.0'" build_mongoreplay: true - additional_targets: mongoe + additional_targets: mongoed display_tasks: - *unittests tasks: diff --git a/src/mongo/embedded/SConscript b/src/mongo/embedded/SConscript index ab41ecd6b45..ca7f7def912 100644 --- a/src/mongo/embedded/SConscript +++ b/src/mongo/embedded/SConscript @@ -107,10 +107,10 @@ capiTest = yamlEnv.Program( env.RegisterUnitTest(capiTest[0]) -mongoe = yamlEnv.Program( - target='mongoe', +mongoed = yamlEnv.Program( + target='mongoed', source=[ - 'mongoe_main.cpp', + 'mongoed_main.cpp', ], LIBDEPS=[ '$BUILD_DIR/mongo/db/commands/shell_protocol', @@ -126,12 +126,12 @@ mongoe = yamlEnv.Program( ], ) -env.Alias('all', mongoe) # This ensures it compiles and links, but doesn't copy it anywhere. +env.Alias('all', mongoed) # This ensures it compiles and links, but doesn't copy it anywhere. hygienic = get_option('install-mode') == 'hygienic' if not hygienic: - env.Install('#/', mongoe) + env.Install('#/', mongoed) if not env['MONGO_HAVE_LIBMONGOC']: Return() diff --git a/src/mongo/embedded/mongoe_main.cpp b/src/mongo/embedded/mongoed_main.cpp index dfa58b9332a..c517624b710 100644 --- a/src/mongo/embedded/mongoe_main.cpp +++ b/src/mongo/embedded/mongoed_main.cpp @@ -57,7 +57,7 @@ MONGO_INITIALIZER_WITH_PREREQUISITES(SignalProcessingStartup, ("ThreadNameInitia return Status::OK(); } -int mongoeMain(int argc, char* argv[], char** envp) { +int mongoedMain(int argc, char* argv[], char** envp) { ServiceContext* serviceContext = nullptr; registerShutdownTask([&]() { @@ -127,10 +127,10 @@ int mongoeMain(int argc, char* argv[], char** envp) { // to process UTF-8 encoded arguments and environment variables without regard to platform. int wmain(int argc, wchar_t* argvW[], wchar_t* envpW[]) { mongo::WindowsCommandLine wcl(argc, argvW, envpW); - return mongo::mongoeMain(argc, wcl.argv(), wcl.envp()); + return mongo::mongoedMain(argc, wcl.argv(), wcl.envp()); } #else int main(int argc, char* argv[], char** envp) { - return mongo::mongoeMain(argc, argv, envp); + return mongo::mongoedMain(argc, argv, envp); } #endif |