Test Runner: Fix default config grouping.

Running "angle_unittests" with --bot-mode would produce noisy test groupings for each permutation of parameterized tests. Fix this by only splitting configs that begin with "ES". e.g. ES2_Vulkan, ES3_OpenGL, etc. Bug: angleproject:3162 Change-Id: I0b0ebe1c9cef9cbbce0489a2bc3f62761d43a1c7 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2419046 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org>

Test Runner: Fix default config grouping.
5d7de5fd · Jamie Madill · Commit Bot · 763e8b81 · 5d7de5fd
Commit 5d7de5fd authored Sep 20, 2020 by Jamie Madill Committed by Commit Bot Sep 21, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

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

No files found.
--- a/src/tests/test_utils/runner/TestSuite.cpp
+++ b/src/tests/test_utils/runner/TestSuite.cpp
@@ -650,7 +650,14 @@ std::string GetConfigNameFromTestIdentifier(const TestIdentifier &id)
    size_t doubleUnderscorePos = id.testName.find("__");
    if (doubleUnderscorePos == std::string::npos)
    {
-        return id.testName.substr(slashPos + 1);
+        std::string configName = id.testName.substr(slashPos + 1);
+
+        if (!BeginsWith(configName, "ES"))
+        {
+            return "default";
+        }
+
+        return configName;
    }
    else
    {
@@ -900,7 +907,8 @@ TestSuite::TestSuite(int *argc, char **argv)
            while (!mTestQueue.empty())
            {
                const std::vector<TestIdentifier> &tests = mTestQueue.front();
-                std::cout << tests[0] << " (" << static_cast<int>(tests.size()) << ")\n";
+                std::cout << GetConfigNameFromTestIdentifier(tests[0]) << " ("
+                          << static_cast<int>(tests.size()) << ")\n";
                mTestQueue.pop();
            }