Tests: Use "__" to delineate test config names.

src/tests/gl_tests/ClearTest.cpp

@@ -157,6 +157,12 @@ std::string MaskedScissoredClearVariationsTestPrint(
     ParseMaskedScissoredClearVariationsTestParams(params, &clearColor, &clearDepth, &clearStencil,
                                                   &maskColor, &maskDepth, &maskStencil, &scissor);
 
+    if (scissor || clearColor || clearDepth || clearStencil || maskColor || maskDepth ||
+        maskStencil)
+    {
+        out << "_";
+    }
+
     if (scissor)
     {
         out << "_scissored";

src/tests/gl_tests/CopyTextureTest.cpp

@@ -123,7 +123,7 @@ std::string CopyTextureVariationsTestPrint(
     const CopyTextureVariationsTestParams &params = paramsInfo.param;
     std::ostringstream out;
 
-    out << std::get<0>(params) << '_';
+    out << std::get<0>(params) << "__";
 
     switch (std::get<1>(params))
     {

src/tests/gl_tests/DrawBaseVertexBaseInstanceTest.cpp

@@ -78,12 +78,12 @@ struct PrintToStringParamName
         const ::testing::TestParamInfo<DrawBaseVertexBaseInstanceTestParams> &info) const
     {
         ::std::stringstream ss;
-        ss << (std::get<3>(info.param) == BufferDataUsageOption::StaticDraw ? "StaticDraw_"
-                                                                            : "DynamicDraw_")
-           << (std::get<2>(info.param) == BaseInstanceOption::UseBaseInstance ? "UseBaseInstance_"
+        ss << std::get<0>(info.param) << "_"
+           << (std::get<3>(info.param) == BufferDataUsageOption::StaticDraw ? "_StaticDraw"
+                                                                            : "_DynamicDraw")
+           << (std::get<2>(info.param) == BaseInstanceOption::UseBaseInstance ? "_UseBaseInstance"
                                                                               : "")
-           << (std::get<1>(info.param) == BaseVertexOption::UseBaseVertex ? "UseBaseVertex_" : "")
-           << std::get<0>(info.param);
+           << (std::get<1>(info.param) == BaseVertexOption::UseBaseVertex ? "_UseBaseVertex" : "");
         return ss.str();
     }
 };

src/tests/gl_tests/DrawBaseVertexVariantsTest.cpp

@@ -71,7 +71,7 @@ std::string DrawBaseVertexVariantsTestPrint(
     const DrawBaseVertexVariantsTestParams &params = paramsInfo.param;
     std::ostringstream out;
 
-    out << std::get<0>(params) << '_';
+    out << std::get<0>(params) << "__";
 
     switch (std::get<1>(params))
     {

src/tests/gl_tests/MultiDrawTest.cpp

@@ -69,9 +69,9 @@ struct PrintToStringParamName
     std::string operator()(const ::testing::TestParamInfo<MultiDrawTestParams> &info) const
     {
         ::std::stringstream ss;
-        ss << (std::get<2>(info.param) == InstancingOption::UseInstancing ? "Instanced_" : "")
-           << (std::get<1>(info.param) == DrawIDOption::UseDrawID ? "DrawID_" : "")
-           << std::get<0>(info.param);
+        ss << std::get<0>(info.param)
+           << (std::get<2>(info.param) == InstancingOption::UseInstancing ? "__Instanced" : "")
+           << (std::get<1>(info.param) == DrawIDOption::UseDrawID ? "__DrawID" : "");
         return ss.str();
     }
 };

src/tests/test_utils/MultiviewTest.cpp

@@ -219,7 +219,7 @@ void AttachMultiviewTextures(GLenum target,
 std::ostream &operator<<(std::ostream &os, const MultiviewImplementationParams &params)
 {
     const PlatformParameters &base = static_cast<const PlatformParameters &>(params);
-    os << base;
+    os << base << "_";
     if (params.mForceUseGeometryShaderOnD3D)
     {
         os << "_force_geom_shader";