Test Runner: Handle GTest sharding args.

scripts/run_gtest_angle_test.py

@@ -66,12 +66,12 @@ def main():
 
     env = os.environ.copy()
 
-    # total_shards = None
-    # shard_index = None
     if 'GTEST_TOTAL_SHARDS' in env:
         extra_flags += ['--shard-count=' + env['GTEST_TOTAL_SHARDS']]
+        env.pop('GTEST_TOTAL_SHARDS')
     if 'GTEST_SHARD_INDEX' in env:
         extra_flags += ['--shard-index=' + env['GTEST_SHARD_INDEX']]
+        env.pop('GTEST_SHARD_INDEX')
 
     # Assume we want to set up the sandbox environment variables all the
     # time; doing so is harmless on non-Linux platforms and is needed

src/tests/test_utils/runner/TestSuite.cpp

@@ -836,7 +836,7 @@ TestSuite::TestSuite(int *argc, char **argv)
 
         if (mFilterString.substr(0, strlen("--gtest_filter=")) != std::string("--gtest_filter="))
         {
-            printf("Filter file must start with \"--gtest_filter=\".");
+            printf("Filter file must start with \"--gtest_filter=\".\n");
             exit(1);
         }
 
@@ -856,6 +856,15 @@ TestSuite::TestSuite(int *argc, char **argv)
 
     if (mShardCount > 0)
     {
+        if (!angle::GetEnvironmentVar("GTEST_SHARD_INDEX").empty() ||
+            !angle::GetEnvironmentVar("GTEST_TOTAL_SHARDS").empty())
+        {
+            printf(
+                "Error: --shard-index and --shard-count are incompatible with GTEST_SHARD_INDEX "
+                "and GTEST_TOTAL_SHARDS.\n");
+            exit(1);
+        }
+
         testSet =
             GetShardTests(testSet, mShardIndex, mShardCount, &mTestFileLines, alsoRunDisabledTests);