Broaden EGLFeatureControlTest Linux AMD suppression

After the initial suppression the bot started failing on the next test. Use GTEST_SKIP in testSetUp to make all tests using the fixture skipped. Bug: chromium:1097750 Change-Id: Ic993d7cd274e1328684571c5ba1a1520b9cb80d5 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2270020Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>

Broaden EGLFeatureControlTest Linux AMD suppression
cbcc500f · Corentin Wallez · Commit Bot · 2cc63fef · cbcc500f
Commit cbcc500f authored Jun 26, 2020 by Corentin Wallez Committed by Commit Bot Jul 01, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

EGLFeatureControlTest.cpp src/tests/egl_tests/EGLFeatureControlTest.cpp +10 -4

No files found.
--- a/src/tests/egl_tests/EGLFeatureControlTest.cpp
+++ b/src/tests/egl_tests/EGLFeatureControlTest.cpp
@@ -16,7 +16,16 @@ using namespace angle;
 class EGLFeatureControlTest : public ANGLETest
 {
  public:
-    void testSetUp() override { mDisplay = EGL_NO_DISPLAY; }
+    void testSetUp() override
+    {
+        // All tests are skipped on old AMD Linux Vulkan driver. See http://crbug.com/1097750
+        if (IsLinux() && IsAMD() && IsVulkan())
+        {
+            GTEST_SKIP();
+        }
+        mDisplay = EGL_NO_DISPLAY;
+    }
    void testTearDown() override
    {
@@ -51,9 +60,6 @@ class EGLFeatureControlTest : public ANGLETest
 // Ensure eglQueryStringiANGLE generates EGL_BAD_DISPLAY if the display passed in is invalid.
 TEST_P(EGLFeatureControlTest, InvalidDisplay)
 {
-    // Test skipped on old AMD Linux Vulkan driver. See http://crbug.com/1097750
-    ANGLE_SKIP_TEST_IF(IsLinux() && IsAMD() && IsVulkan());
    ANGLE_SKIP_TEST_IF(!initTest());
    EXPECT_EQ(nullptr, eglQueryStringiANGLE(EGL_NO_DISPLAY, EGL_FEATURE_NAME_ANGLE, 0));
    EXPECT_EGL_ERROR(EGL_BAD_DISPLAY);