commit 3215ef129d69a7781591bb072f8ee337cce056a7
author Christopher Ferris <cferris@google.com> Tue Mar 12 19:10:35 2019 -0700
committer Christopher Ferris <cferris@google.com> Wed Mar 13 12:42:33 2019 -0700
tree 0e079d38492847ca8cd80126e10b42dde2610f62
parent c2f85d62c5c5cb0cdbe387dccb91551c78943c15

Support gtest sharding options.

Add new unit tests to cover the new options.

Some updates to the unit tests.

This is slightly different from the normal gtest output. The difference
is that isolated framework prints the total number of DISABLED tests,
where gtest only lists the disabled tests it would have had in the shard.

Bug: 126376458

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

Options.cpp

diff --git a/Options.cpp b/Options.cpp
index 55f480c..5de9157 100644
--- a/Options.cpp
+++ b/Options.cpp
@@ -41,8 +41,8 @@
 constexpr uint64_t kDefaultSlowThresholdMs = 2000;
 
 const std::unordered_map<std::string, Options::ArgInfo> Options::kArgs = {
-    {"deadline_threshold_ms", {FLAG_REQUIRES_VALUE, &Options::SetThreshold}},
-    {"slow_threshold_ms", {FLAG_REQUIRES_VALUE, &Options::SetThreshold}},
+    {"deadline_threshold_ms", {FLAG_REQUIRES_VALUE, &Options::SetNumeric}},
+    {"slow_threshold_ms", {FLAG_REQUIRES_VALUE, &Options::SetNumeric}},
     {"gtest_format", {FLAG_NONE, &Options::SetBool}},
     {"gtest_list_tests", {FLAG_NONE, &Options::SetBool}},
     {"gtest_filter", {FLAG_ENVIRONMENT_VARIABLE | FLAG_REQUIRES_VALUE, &Options::SetString}},
@@ -66,6 +66,10 @@
     {"gtest_shuffle", {FLAG_ENVIRONMENT_VARIABLE | FLAG_INCOMPATIBLE, nullptr}},
     {"gtest_stream_result_to", {FLAG_ENVIRONMENT_VARIABLE | FLAG_INCOMPATIBLE, nullptr}},
     {"gtest_throw_on_failure", {FLAG_ENVIRONMENT_VARIABLE | FLAG_INCOMPATIBLE, nullptr}},
+    {"gtest_shard_index",
+     {FLAG_ENVIRONMENT_VARIABLE | FLAG_REQUIRES_VALUE, &Options::SetNumericEnvOnly}},
+    {"gtest_total_shards",
+     {FLAG_ENVIRONMENT_VARIABLE | FLAG_REQUIRES_VALUE, &Options::SetNumericEnvOnly}},
 };
 
 static void PrintError(const std::string& arg, std::string msg, bool from_env) {
@@ -108,8 +112,8 @@
   return true;
 }
 
-bool Options::SetThreshold(const std::string& arg, const std::string& value, bool from_env) {
-  uint64_t* numeric = &thresholds_.find(arg)->second;
+bool Options::SetNumeric(const std::string& arg, const std::string& value, bool from_env) {
+  uint64_t* numeric = &numerics_.find(arg)->second;
   if (!GetNumeric<uint64_t>(arg.c_str(), value.c_str(), numeric, from_env)) {
     return false;
   }
@@ -120,6 +124,18 @@
   return true;
 }
 
+bool Options::SetNumericEnvOnly(const std::string& arg, const std::string& value, bool from_env) {
+  if (!from_env) {
+    PrintError(arg, "is only supported as an environment variable.", false);
+    return false;
+  }
+  uint64_t* numeric = &numerics_.find(arg)->second;
+  if (!GetNumeric<uint64_t>(arg.c_str(), value.c_str(), numeric, from_env)) {
+    return false;
+  }
+  return true;
+}
+
 bool Options::SetBool(const std::string& arg, const std::string&, bool) {
   bools_.find(arg)->second = true;
   return true;
@@ -198,9 +214,11 @@
   // Initialize the variables.
   job_count_ = static_cast<size_t>(sysconf(_SC_NPROCESSORS_ONLN));
   num_iterations_ = ::testing::GTEST_FLAG(repeat);
-  thresholds_.clear();
-  thresholds_["deadline_threshold_ms"] = kDefaultDeadlineThresholdMs;
-  thresholds_["slow_threshold_ms"] = kDefaultSlowThresholdMs;
+  numerics_.clear();
+  numerics_["deadline_threshold_ms"] = kDefaultDeadlineThresholdMs;
+  numerics_["slow_threshold_ms"] = kDefaultSlowThresholdMs;
+  numerics_["gtest_shard_index"] = 0;
+  numerics_["gtest_total_shards"] = 0;
   strings_.clear();
   strings_["gtest_color"] = ::testing::GTEST_FLAG(color);
   strings_["xml_file"] = ::testing::GTEST_FLAG(output);