Test Runner: Improve sharding validation.

The prior check was incorrectly flagging index=0/count=2 as invalid. It also missed a few cases like a shard count of 0. Bug: angleproject:3162 Change-Id: Ida4c0f454ece15e4304d024d205475acf0f135e6 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2423207Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Test Runner: Improve sharding validation.
867358b7 · Jamie Madill · Commit Bot · 4f6c6d5a · 867358b7
Commit 867358b7 authored Sep 21, 2020 by Jamie Madill Committed by Commit Bot Sep 22, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 2 deletions

TestSuite.cpp src/tests/test_utils/runner/TestSuite.cpp +13 -2

No files found.
--- a/src/tests/test_utils/runner/TestSuite.cpp
+++ b/src/tests/test_utils/runner/TestSuite.cpp
@@ -812,7 +812,7 @@ TestSuite::TestSuite(int *argc, char **argv)
        ++argIndex;
    }
-    if ((mShardIndex > 0) != (mShardCount > 1))
+    if ((mShardIndex == -1) != (mShardCount == -1))
    {
        printf("Shard index and shard count must be specified together.\n");
        exit(1);
@@ -861,8 +861,19 @@ TestSuite::TestSuite(int *argc, char **argv)
    std::vector<TestIdentifier> testSet = GetFilteredTests(&mTestFileLines, alsoRunDisabledTests);
-    if (mShardCount > 0)
+    if (mShardCount == 0)
    {
+        printf("Shard count must be > 0.\n");
+        exit(1);
+    }
+    else if (mShardCount > 0)
+    {
+        if (mShardIndex >= mShardCount)
+        {
+            printf("Shard index must be less than shard count.\n");
+            exit(1);
+        }
        if (!angle::GetEnvironmentVar("GTEST_SHARD_INDEX").empty() ||
            !angle::GetEnvironmentVar("GTEST_TOTAL_SHARDS").empty())
        {