Use named value-parameterized tests for angle_end2end_tests

src/tests/gl_tests/ProgramBinaryTest.cpp

@@ -185,6 +185,18 @@ struct PlatformsWithLinkResult : PlatformParameters
     bool expectedLinkResult;
 };
 
+// Provide a custom gtest parameter name function for PlatformsWithLinkResult
+// to avoid returning the same parameter name twice. Such a conflict would happen
+// between ES2_D3D11_to_ES2D3D11 and ES2_D3D11_to_ES3D3D11 as they were both
+// named ES2_D3D11
+std::ostream &operator<<(std::ostream& stream, const PlatformsWithLinkResult &platform)
+{
+    const PlatformParameters &platform1 = platform;
+    const PlatformParameters &platform2 = platform.loadParams;
+    stream << platform1 << "_to_" << platform2;
+    return stream;
+}
+
 class ProgramBinariesAcrossPlatforms : public testing::TestWithParam<PlatformsWithLinkResult>
 {
   public:

src/tests/test_utils/angle_test_configs.h

@@ -7,6 +7,13 @@
 #ifndef ANGLE_TEST_CONFIGS_H_
 #define ANGLE_TEST_CONFIGS_H_
 
+// On Linux EGL/egl.h includes X.h which does defines for some very common
+// names that are used by gtest (like None and Bool) and causes a lot of
+// compilation errors. To work around this, even if this file doesn't use it,
+// we include gtest before EGL so that it compiles fine in other files that
+// want to use gtest.
+#include <gtest/gtest.h>
+
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 

src/tests/test_utils/angle_test_instantiate.h

@@ -10,6 +10,8 @@
 #ifndef ANGLE_TEST_INSTANTIATE_H_
 #define ANGLE_TEST_INSTANTIATE_H_
 
+#include <gtest/gtest.h>
+
 #include "common/debug.h"
 
 namespace angle
@@ -41,7 +43,9 @@ std::vector<T> FilterTestParams(const T *params, size_t numParams)
 // 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_CASE_P(, testName, testing::ValuesIn(::angle::FilterTestParams(testName##params, ArraySize(testName##params))));
+    INSTANTIATE_TEST_CASE_P(, testName, \
+                              testing::ValuesIn(::angle::FilterTestParams(testName##params, ArraySize(testName##params))), \
+                              testing::PrintToStringParamName());
 
 } // namespace angle