Add command line option to filter by test config.

src/tests/angle_end2end_tests_main.cpp

@@ -10,8 +10,8 @@ void ANGLEProcessTestArgs(int *argc, char *argv[]);
 
 int main(int argc, char **argv)
 {
-    testing::InitGoogleTest(&argc, argv);
     ANGLEProcessTestArgs(&argc, argv);
+    testing::InitGoogleTest(&argc, argv);
     int rt = RUN_ALL_TESTS();
     return rt;
 }

src/tests/test_utils/ANGLETest.cpp

@@ -292,6 +292,8 @@ TestPlatformContext gPlatformContext;
 
 // After a fixed number of iterations we reset the test window. This works around some driver bugs.
 constexpr uint32_t kWindowReuseLimit = 50;
+
+constexpr char kUseConfig[] = "--use-config=";
 }  // anonymous namespace
 
 // static
@@ -1277,6 +1279,14 @@ angle::Library *ANGLETestEnvironment::GetWGLLibrary()
 void ANGLEProcessTestArgs(int *argc, char *argv[])
 {
     testing::AddGlobalTestEnvironment(new ANGLETestEnvironment());
+
+    for (int argIndex = 1; argIndex < *argc; argIndex++)
+    {
+        if (strncmp(argv[argIndex], kUseConfig, strlen(kUseConfig)) == 0)
+        {
+            angle::gSelectedConfig = std::string(argv[argIndex] + strlen(kUseConfig));
+        }
+    }
 }
 
 EGLTest::EGLTest() = default;

src/tests/test_utils/angle_test_instantiate.cpp

@@ -69,6 +69,8 @@ bool IsNativeConfigSupported(const PlatformParameters &param, OSWindow *osWindow
 }
 }  // namespace
 
+std::string gSelectedConfig;
+
 SystemInfo *GetTestSystemInfo()
 {
     static SystemInfo *sSystemInfo = nullptr;
@@ -412,11 +414,22 @@ bool IsPlatformAvailable(const PlatformParameters &param)
     {
         return iter->second;
     }
+
+    bool result = false;
+
+    if (!gSelectedConfig.empty())
+    {
+        std::stringstream strstr;
+        strstr << param;
+        if (strstr.str() == gSelectedConfig)
+        {
+            result = true;
+        }
+    }
     else
     {
         const SystemInfo *systemInfo = GetTestSystemInfo();
 
-        bool result = false;
         if (systemInfo)
         {
             result = IsConfigWhitelisted(*systemInfo, param);
@@ -425,18 +438,18 @@ bool IsPlatformAvailable(const PlatformParameters &param)
         {
             result = IsConfigSupported(param);
         }
+    }
 
-        paramAvailabilityCache[param] = result;
-
-        if (!result)
-        {
-            std::cout << "Skipping tests using configuration " << param
-                      << " because it is not available." << std::endl;
-        }
+    paramAvailabilityCache[param] = result;
 
-        // Uncomment this to print available platforms.
-        // std::cout << "Platform: " << param << " (" << paramAvailabilityCache.size() << ")\n";
-        return result;
+    if (!result)
+    {
+        std::cout << "Skipping tests using configuration " << param
+                  << " because it is not available." << std::endl;
     }
+
+    // Uncomment this to print available platforms.
+    // std::cout << "Platform: " << param << " (" << paramAvailabilityCache.size() << ")\n";
+    return result;
 }
 }  // namespace angle

src/tests/test_utils/angle_test_instantiate.h

@@ -121,6 +121,9 @@ bool IsConfigSupported(const PlatformParameters &param);
 
 // Returns shared test system information. Can be used globally in the tests.
 SystemInfo *GetTestSystemInfo();
+
+// Active config (e.g. ES2_Vulkan).
+extern std::string gSelectedConfig;
 }  // namespace angle
 
 #endif  // ANGLE_TEST_INSTANTIATE_H_