From 69f72b4183a6271865075754e1e44a232d562f5f Mon Sep 17 00:00:00 2001
From: Jamie Madill <jmadill@chromium.org>
Date: Thu, 2 May 2019 16:12:54 -0400
Subject: [PATCH] Simplify ANGLE test config names.

We don't need to use upper case. Lower case can be more readable.

Skip a test on Linux/NV/Vulkan that became flaky after changing
the test order.

Bug: angleproject:3393
Change-Id: Ie027e08ddc9d47b9484cf5b1aaca72a05dd60517
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1574676
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
---
 src/tests/gl_tests/RobustResourceInitTest.cpp |  3 ++
 src/tests/test_utils/angle_test_configs.cpp   | 30 +++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/tests/gl_tests/RobustResourceInitTest.cpp b/src/tests/gl_tests/RobustResourceInitTest.cpp
index 109d2e2d7..4551b4c58 100644
--- a/src/tests/gl_tests/RobustResourceInitTest.cpp
+++ b/src/tests/gl_tests/RobustResourceInitTest.cpp
@@ -842,6 +842,9 @@ TEST_P(RobustResourceInitTest, ReadingOutOfBoundsCopiedTexture)
 {
     ANGLE_SKIP_TEST_IF(!hasGLExtension());
 
+    // Flaky failure on Linux / NV / Vulkan when run in a sequence. http://anglebug.com/3416
+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsNVIDIA() && IsLinux());
+
     GLTexture tex;
     setupTexture(&tex);
     GLFramebuffer fbo;
diff --git a/src/tests/test_utils/angle_test_configs.cpp b/src/tests/test_utils/angle_test_configs.cpp
index b3227083a..43819520a 100644
--- a/src/tests/test_utils/angle_test_configs.cpp
+++ b/src/tests/test_utils/angle_test_configs.cpp
@@ -74,7 +74,7 @@ std::ostream &operator<<(std::ostream &stream, const PlatformParameters &pp)
             switch (pp.eglParameters.renderer)
             {
                 case EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE:
-                    stream << "DEFAULT";
+                    stream << "Default";
                     break;
                 case EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE:
                     stream << "D3D9";
@@ -83,19 +83,19 @@ std::ostream &operator<<(std::ostream &stream, const PlatformParameters &pp)
                     stream << "D3D11";
                     break;
                 case EGL_PLATFORM_ANGLE_TYPE_NULL_ANGLE:
-                    stream << "NULL";
+                    stream << "Null";
                     break;
                 case EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE:
-                    stream << "OPENGL";
+                    stream << "OpenGL";
                     break;
                 case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE:
-                    stream << "OPENGLES";
+                    stream << "OpenGLES";
                     break;
                 case EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE:
-                    stream << "VULKAN";
+                    stream << "Vulkan";
                     break;
                 default:
-                    stream << "UNDEFINED";
+                    stream << "Undefined";
                     break;
             }
             break;
@@ -107,7 +107,7 @@ std::ostream &operator<<(std::ostream &stream, const PlatformParameters &pp)
             stream << "GLES";
             break;
         default:
-            stream << "ERROR";
+            stream << "Error";
             break;
     }
 
@@ -129,30 +129,30 @@ std::ostream &operator<<(std::ostream &stream, const PlatformParameters &pp)
             break;
 
         case EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE:
-            stream << "_NULL";
+            stream << "_Null";
             break;
 
         case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE:
-            stream << "_REFERENCE";
+            stream << "_Reference";
             break;
 
         case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE:
-            stream << "_WARP";
+            stream << "_Warp";
             break;
 
         default:
-            stream << "_ERR";
+            stream << "_Error";
             break;
     }
 
     switch (pp.eglParameters.presentPath)
     {
         case EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE:
-            stream << "_PRESENT_PATH_COPY";
+            stream << "_PresentPathCopy";
             break;
 
         case EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE:
-            stream << "_PRESENT_PATH_FAST";
+            stream << "_PresentPathFast";
             break;
 
         case EGL_DONT_CARE:
@@ -160,13 +160,13 @@ std::ostream &operator<<(std::ostream &stream, const PlatformParameters &pp)
             break;
 
         default:
-            stream << "_ERR";
+            stream << "_Error";
             break;
     }
 
     if (pp.eglParameters.contextVirtualization == EGL_FALSE)
     {
-        stream << "_NO_VIRTUAL";
+        stream << "_NoVirtual";
     }
 
     return stream;