end2end_tests: Adds more skips for new tests and testers

src/tests/gl_tests/GLSLTest.cpp

@@ -2641,28 +2641,11 @@ TEST_P(GLSLTest_ES31, FindMSBAndFindLSBCornerCases)
 // Test that writing into a swizzled vector that is dynamically indexed succeeds.
 TEST_P(GLSLTest_ES3, WriteIntoDynamicIndexingOfSwizzledVector)
 {
-    if (IsNVIDIA() && IsOpenGL())
+    if (IsOpenGL())
     {
         // http://anglebug.com/1924
-        std::cout << "Test skipped on NVIDIA OpenGL because it has incorrect results" << std::endl;
-        return;
-    }
-
-    if (IsAMD() && IsOpenGL())
-    {
-        std::cout << "Test skipped on AMD OpenGL because it has incorrect results" << std::endl;
-        return;
-    }
-
-    if (IsAndroid())
-    {
-        std::cout << "Test skipped on Android because it has incorrect results" << std::endl;
-        return;
-    }
-
-    if (IsOSX())
-    {
-        std::cout << "Test skipped on Mac OSX because it has incorrect results" << std::endl;
+        std::cout << "Test skipped on all OpenGL configurations because it has incorrect results"
+                  << std::endl;
         return;
     }
 

src/tests/gl_tests/MultisampleCompatibilityTest.cpp

@@ -3,9 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// StateChangeTest:
-//   Specifically designed for an ANGLE implementation of GL, these tests validate that
-//   ANGLE's dirty bits systems don't get confused by certain sequences of state changes.
+// MultisampleCompatibilityTest.cpp:
+//   Tests for the EXT_multisample_compatibility extension.
 //
 
 #include "test_utils/ANGLETest.h"
@@ -245,6 +244,13 @@ TEST_P(EXTMultisampleCompatibilityTest, DrawAlphaOneAndResolve)
     if (!isApplicable())
         return;
 
+    // TODO: Figure out why this fails on Android.
+    if (IsAndroid())
+    {
+        std::cout << "Test skipped on Android." << std::endl;
+        return;
+    }
+
     // SAMPLE_ALPHA_TO_ONE is specified to transform alpha values of
     // covered samples to 1.0. In order to detect it, we use non-1.0
     // alpha.
@@ -435,4 +441,4 @@ ANGLE_INSTANTIATE_TEST(MultisampleCompatibilityTest,
                        ES2_OPENGLES(),
                        ES3_D3D11(),
                        ES3_OPENGL(),
-                       ES3_OPENGLES());
\ No newline at end of file
+                       ES3_OPENGLES());