Skip EGLSurfaceTest.SwapInterval on Linux NVIDIA Vulkan.

Flaky hangs on Ubuntu 19.04 Bug: angleproject:3618 Change-Id: Iab85c94e90aec0f7b15fe0fbc14ae1a8d0734d48 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1689270Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

Skip EGLSurfaceTest.SwapInterval on Linux NVIDIA Vulkan.
c26b7914 · Yuly Novikov · Commit Bot · a71a8c66 · c26b7914 · c26b7914
Commit c26b7914 authored Jul 04, 2019 by Yuly Novikov Committed by Commit Bot Jul 04, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 2 deletions

EGLSurfaceTest.cpp src/tests/egl_tests/EGLSurfaceTest.cpp +3 -2

ANGLETest.h src/tests/test_utils/ANGLETest.h +10 -0

No files found.
--- a/src/tests/egl_tests/EGLSurfaceTest.cpp
+++ b/src/tests/egl_tests/EGLSurfaceTest.cpp
@@ -354,8 +354,9 @@ TEST_P(EGLSurfaceTest, SwapInterval)
    // On OSX, maxInterval >= 1 is advertised, but is not implemented.  http://anglebug.com/3140
    ANGLE_SKIP_TEST_IF(IsOSX());
    // Flaky hang on Nexus 5X and 6P. http://anglebug.com/3364
-    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) &&
-                       GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE);
+    ANGLE_SKIP_TEST_IF((IsNexus5X() || IsNexus6P()) && isGLESRenderer());
+    // Flaky hang on Ubuntu 19.04 NVIDIA Vulkan. http://anglebug.com/3618
+    ANGLE_SKIP_TEST_IF(IsLinux() && IsNVIDIA() && isVulkanRenderer());

    initializeDisplay();
    initializeSurfaceWithDefaultConfig();

--- a/src/tests/test_utils/ANGLETest.h
+++ b/src/tests/test_utils/ANGLETest.h
@@ -413,11 +413,21 @@ class ANGLETestBase
        return mCurrentParams->getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE;
    }

+    bool isGLESRenderer() const
+    {
+        return mCurrentParams->getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE;
+    }
+
    bool isD3D11Renderer() const
    {
        return mCurrentParams->getRenderer() == EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE;
    }

+    bool isVulkanRenderer() const
+    {
+        return mCurrentParams->getRenderer() == EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE;
+    }
+
  private:
    void checkD3D11SDKLayersMessages();