commit fc501f440e2d4b8063bcfbe68e798852f7bcb427
author Christopher Ferris <cferris@google.com> Fri Sep 21 12:38:12 2018 -0700
committer Christopher Ferris <cferris@google.com> Fri Sep 21 12:45:09 2018 -0700
tree 423c03ed6846e99fb4ee82025586c834eca014c9
parent ee59d495762f170fcf6e5db93bef1a5947adbfe8

Allow --gtest_print_time without a value.

Small clean up of other unit tests.

Test: Ran new unit tests.
Change-Id: If7b871f742c73236e276a8c411bc61754dd6e5a0

Options.cpp

diff --git a/Options.cpp b/Options.cpp
index 4b203af..59acb48 100644
--- a/Options.cpp
+++ b/Options.cpp
@@ -41,25 +41,25 @@
 constexpr uint64_t kDefaultSlowThresholdMs = 2000;
 
 const std::unordered_map<std::string, Options::ArgInfo> Options::kArgs = {
-    {"deadline_threshold_ms", {FLAG_TAKES_VALUE, &Options::SetThreshold}},
-    {"slow_threshold_ms", {FLAG_TAKES_VALUE, &Options::SetThreshold}},
+    {"deadline_threshold_ms", {FLAG_REQUIRES_VALUE, &Options::SetThreshold}},
+    {"slow_threshold_ms", {FLAG_REQUIRES_VALUE, &Options::SetThreshold}},
     {"gtest_format", {FLAG_NONE, &Options::SetBool}},
     {"gtest_list_tests", {FLAG_NONE, &Options::SetBool}},
-    {"gtest_filter", {FLAG_ENVIRONMENT_VARIABLE | FLAG_TAKES_VALUE, &Options::SetString}},
+    {"gtest_filter", {FLAG_ENVIRONMENT_VARIABLE | FLAG_REQUIRES_VALUE, &Options::SetString}},
     {
         "gtest_repeat",
-        {FLAG_ENVIRONMENT_VARIABLE | FLAG_TAKES_VALUE, &Options::SetIterations},
+        {FLAG_ENVIRONMENT_VARIABLE | FLAG_REQUIRES_VALUE, &Options::SetIterations},
     },
-    {"gtest_output", {FLAG_ENVIRONMENT_VARIABLE | FLAG_TAKES_VALUE, &Options::SetXmlFile}},
-    {"gtest_print_time", {FLAG_ENVIRONMENT_VARIABLE | FLAG_TAKES_VALUE, &Options::SetPrintTime}},
+    {"gtest_output", {FLAG_ENVIRONMENT_VARIABLE | FLAG_REQUIRES_VALUE, &Options::SetXmlFile}},
+    {"gtest_print_time", {FLAG_ENVIRONMENT_VARIABLE | FLAG_OPTIONAL_VALUE, &Options::SetPrintTime}},
     {
         "gtest_also_run_disabled_tests",
         {FLAG_ENVIRONMENT_VARIABLE | FLAG_CHILD, &Options::SetBool},
     },
     {"gtest_color",
-     {FLAG_ENVIRONMENT_VARIABLE | FLAG_TAKES_VALUE | FLAG_CHILD, &Options::SetString}},
+     {FLAG_ENVIRONMENT_VARIABLE | FLAG_REQUIRES_VALUE | FLAG_CHILD, &Options::SetString}},
     {"gtest_death_test_style",
-     {FLAG_ENVIRONMENT_VARIABLE | FLAG_TAKES_VALUE | FLAG_CHILD, nullptr}},
+     {FLAG_ENVIRONMENT_VARIABLE | FLAG_REQUIRES_VALUE | FLAG_CHILD, nullptr}},
     {"gtest_break_on_failure", {FLAG_ENVIRONMENT_VARIABLE | FLAG_INCOMPATIBLE, nullptr}},
     {"gtest_catch_exceptions", {FLAG_ENVIRONMENT_VARIABLE | FLAG_INCOMPATIBLE, nullptr}},
     {"gtest_random_seed", {FLAG_ENVIRONMENT_VARIABLE | FLAG_INCOMPATIBLE, nullptr}},
@@ -96,7 +96,7 @@
 }
 
 bool Options::SetPrintTime(const std::string&, const std::string& value, bool) {
-  if (strtol(value.c_str(), nullptr, 10) == 0) {
+  if (!value.empty() && strtol(value.c_str(), nullptr, 10) == 0) {
     bools_.find("gtest_print_time")->second = false;
   }
   return true;
@@ -171,7 +171,7 @@
   }
 
   if (info.flags & FLAG_TAKES_VALUE) {
-    if (value.empty()) {
+    if ((info.flags & FLAG_REQUIRES_VALUE) && value.empty()) {
       PrintError(arg, "requires an argument.", from_env);
       return false;
     }