EGLContextCompatibility: suppress test on Linux non-standalone

build/common_defines.gypi

@@ -53,6 +53,13 @@
                 '<(windows_sdk_path)/Include/um',
             ],
         }],
+        ['angle_standalone==1',
+        {
+            'defines':
+            [
+                'ANGLE_STANDALONE_BUILD',
+            ],
+        }],
     ],
     'msvs_settings':
     {

src/tests/egl_tests/EGLContextCompatibilityTest.cpp

@@ -175,15 +175,6 @@ class EGLContextCompatibilityTest : public ANGLETest
         eglMakeCurrent(mDisplay, surface, surface, context);
         ASSERT_EGL_SUCCESS();
 
-#ifdef ANGLE_PLATFORM_LINUX
-        // TODO(cwallez): figure out why this is broken on Linux/AMD.
-        if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
-        {
-            eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-            return;
-        }
-#endif
-
         glViewport(0, 0, 500, 500);
         glClearColor(0.0f, 0.0f, 1.0f, 1.0f);
         glClear(GL_COLOR_BUFFER_BIT);
@@ -201,6 +192,9 @@ class EGLContextCompatibilityTest : public ANGLETest
     }
 };
 
+// TODO(cwallez) makeCurrent fails for some config on Linux/AMD
+#if !defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_STANDALONE_BUILD)
+
 // The test is split in several subtest so that simple cases
 // are tested separately. Also each surface types are not tested
 // together.
@@ -291,4 +285,6 @@ TEST_P(EGLContextCompatibilityTest, PbufferDifferentConfig)
     }
 }
 
+#endif // !defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_STANDALONE_BUILD)
+
 ANGLE_INSTANTIATE_TEST(EGLContextCompatibilityTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL());