Allow testing::Combine in ANGLE_INSTANTIATE_TEST

src/tests/test_utils/ANGLETest.cpp

@@ -1161,18 +1161,6 @@ void ANGLETestBase::SetWindowVisible(bool isVisible)
     mOSWindow->setVisible(isVisible);
 }
 
-ANGLETest::ANGLETest() : ANGLETestBase(GetParam()) {}
-
-void ANGLETest::SetUp()
-{
-    ANGLETestBase::ANGLETestSetUp();
-}
-
-void ANGLETest::TearDown()
-{
-    ANGLETestBase::ANGLETestTearDown();
-}
-
 bool IsIntel()
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));

src/tests/test_utils/ANGLETest.h

@@ -434,16 +434,32 @@ class ANGLETestBase
     static Optional<EGLint> mLastRendererType;
 };
 
-class ANGLETest : public ANGLETestBase, public ::testing::TestWithParam<angle::PlatformParameters>
+template <typename Params = angle::PlatformParameters>
+class ANGLETestWithParam : public ANGLETestBase, public ::testing::TestWithParam<Params>
 {
   protected:
-    ANGLETest();
+    ANGLETestWithParam();
 
   public:
-    void SetUp() override;
-    void TearDown() override;
+    void SetUp() override { ANGLETestBase::ANGLETestSetUp(); }
+
+    void TearDown() override { ANGLETestBase::ANGLETestTearDown(); }
 };
 
+template <typename Params>
+ANGLETestWithParam<Params>::ANGLETestWithParam()
+    : ANGLETestBase(std::get<angle::PlatformParameters>(this->GetParam()))
+{}
+
+template <>
+inline ANGLETestWithParam<angle::PlatformParameters>::ANGLETestWithParam()
+    : ANGLETestBase(this->GetParam())
+{}
+
+// Note: this hack is not necessary in C++17.  Once we switch to C++17, we can just rename
+// ANGLETestWithParam to ANGLETest.
+using ANGLETest = ANGLETestWithParam<>;
+
 class ANGLETestEnvironment : public testing::Environment
 {
   public:

src/tests/test_utils/angle_test_instantiate.h

@@ -51,15 +51,50 @@ std::vector<T> FilterTestParams(const std::vector<T> &params)
     return FilterTestParams(params.data(), params.size());
 }
 
+// Used to generate valid test names out of testing::PrintToStringParamName used in combined tests.
+struct CombinedPrintToStringParamName
+{
+    template <class ParamType>
+    std::string operator()(const testing::TestParamInfo<ParamType> &info) const
+    {
+        std::string name = testing::PrintToStringParamName()(info);
+        std::string sanitized;
+        for (const char c : name)
+        {
+            if (c == ',')
+            {
+                sanitized += '_';
+            }
+            else if (isalnum(c) || c == '_')
+            {
+                sanitized += c;
+            }
+        }
+        return sanitized;
+    }
+};
+
+#define ANGLE_INSTANTIATE_TEST_PLATFORMS(testName) \
+    testing::ValuesIn(::angle::FilterTestParams(testName##params, ArraySize(testName##params)))
+
 // Instantiate the test once for each extra argument. The types of all the
 // arguments must match, and getRenderer must be implemented for that type.
-#define ANGLE_INSTANTIATE_TEST(testName, firstParam, ...)                         \
-    const decltype(firstParam) testName##params[] = {firstParam, ##__VA_ARGS__};  \
-    INSTANTIATE_TEST_SUITE_P(, testName,                                          \
-                             testing::ValuesIn(::angle::FilterTestParams(         \
-                                 testName##params, ArraySize(testName##params))), \
+#define ANGLE_INSTANTIATE_TEST(testName, first, ...)                                 \
+    const decltype(first) testName##params[] = {first, ##__VA_ARGS__};               \
+    INSTANTIATE_TEST_SUITE_P(, testName, ANGLE_INSTANTIATE_TEST_PLATFORMS(testName), \
                              testing::PrintToStringParamName())
 
+// Instantiate the test for a combination of N parameters and the enumeration of platforms in the
+// extra args, similar to ANGLE_INSTANTIATE_TEST.  The macros are defined only for the Ns currently
+// in use, and can be expanded as necessary.
+#define ANGLE_INSTANTIATE_TEST_COMBINE_5(testName, print, combine1, combine2, combine3, combine4, \
+                                         combine5, first, ...)                                    \
+    const decltype(first) testName##params[] = {first, ##__VA_ARGS__};                            \
+    INSTANTIATE_TEST_SUITE_P(, testName,                                                          \
+                             testing::Combine(ANGLE_INSTANTIATE_TEST_PLATFORMS(testName),         \
+                                              combine1, combine2, combine3, combine4, combine5),  \
+                             print)
+
 // Checks if a config is expected to be supported by checking a system-based white list.
 bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters &param);