diff options
| author | Christopher Ferris <cferris@google.com> | 2019-06-19 17:55:12 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-19 17:55:12 -0700 |
| commit | 4b919654bac59ab4d041e91ce188cdaaf3fa8b5b (patch) | |
| tree | a8d9462925358ff3c031ad53de0916e56bb6422f | |
| parent | e6faacb5e573feed5141a5ce9294c7fb578b45f7 (diff) | |
| parent | 68703fe40f1d5296fdbbd15040eda6a4c635276a (diff) | |
| download | gtest_extras-4b919654bac59ab4d041e91ce188cdaaf3fa8b5b.tar.gz | |
Add the option --gtest_format back.
am: 68703fe40f
Change-Id: I636c86016f9d9e0c28b5c90db80d2c6607820eeb
| -rw-r--r-- | Options.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Options.cpp b/Options.cpp index caf6db1..9130ccf 100644 --- a/Options.cpp +++ b/Options.cpp @@ -69,6 +69,8 @@ const std::unordered_map<std::string, Options::ArgInfo> Options::kArgs = { {FLAG_ENVIRONMENT_VARIABLE | FLAG_REQUIRES_VALUE, &Options::SetNumericEnvOnly}}, {"gtest_total_shards", {FLAG_ENVIRONMENT_VARIABLE | FLAG_REQUIRES_VALUE, &Options::SetNumericEnvOnly}}, + // This does nothing, only added so that passing this option does not exit. + {"gtest_format", {FLAG_NONE, &Options::SetBool}}, }; static void PrintError(const std::string& arg, std::string msg, bool from_env) { @@ -227,6 +229,9 @@ bool Options::Process(const std::vector<const char*>& args, std::vector<const ch bools_["gtest_also_run_disabled_tests"] = ::testing::GTEST_FLAG(also_run_disabled_tests); bools_["gtest_list_tests"] = false; + // This does nothing, only added so that passing this option does not exit. + bools_["gtest_format"] = true; + child_args->clear(); // Loop through all of the possible environment variables. |