Changed results due to ANGLE use
authorryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Feb 2020 01:34:28 +0000 (01:34 +0000)
committerryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Feb 2020 01:34:28 +0000 (01:34 +0000)
https://bugs.webkit.org/show_bug.cgi?id=207858

Unreviewed test gardening.

Remove conflict markers that were accidentally added as part of r256880,
remove duplicated expectation for a test, and move the expectations to the same
file as the rest of the ANGLE related failures.

* platform/ios-wk2/TestExpectations:
* platform/ios/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256897 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/ios-wk2/TestExpectations
LayoutTests/platform/ios/TestExpectations

index 0563c9b..a802521 100644 (file)
@@ -1,3 +1,17 @@
+2020-02-18  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Changed results due to ANGLE use
+        https://bugs.webkit.org/show_bug.cgi?id=207858
+
+        Unreviewed test gardening.
+
+        Remove conflict markers that were accidentally added as part of r256880,
+        remove duplicated expectation for a test, and move the expectations to the same
+        file as the rest of the ANGLE related failures.
+
+        * platform/ios-wk2/TestExpectations:
+        * platform/ios/TestExpectations:
+
 2020-02-18  Zalan Bujtas  <zalan@apple.com>
 
         [LFC][IFC] Replaced elements can also establish formatting contexts.
index 141b8ff..d4a6e82 100644 (file)
@@ -1416,14 +1416,4 @@ webkit.org/b/207774 http/wpt/service-workers/third-party-cookie.html [ Pass Time
 webkit.org/b/207866 imported/w3c/IndexedDB-private-browsing [ Pass Timeout ]
 
 # skip LFC regression tests on iOS for now.
-<<<<<<< HEAD
 fast/layoutformattingcontext/ [ Skip ]
-
-webkit.org/b/207896 fast/canvas/webgl/oes-vertex-array-object.html [ Pass Failure ]
-=======
-fast/layoutformattingcontext/block-only/ [ Skip ]
-
-webkit.org/b/207858 fast/canvas/webgl/oes-vertex-array-object.html [ Pass Failure ]
-
-webkit.org/b/207858 fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html [ Pass Failure ]
->>>>>>> Changed results due to ANGLE use
index f41fdd8..f5672f3 100644 (file)
@@ -3513,6 +3513,8 @@ webkit.org/b/207858 fast/canvas/webgl/uninitialized-test.html [ Pass Failure ]
 webkit.org/b/207858 fast/canvas/webgl/webgl-depth-texture.html [ Pass Failure ]
 webkit.org/b/207858 fast/canvas/webgl/webgl-texture-binding-preserved.html [ Pass Failure ]
 webkit.org/b/207858 fast/canvas/webgl/oes-texture-float-linear.html [ Pass Failure ]
+webkit.org/b/207858 fast/canvas/webgl/oes-vertex-array-object.html [ Pass Failure ]
+webkit.org/b/207858 fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html [ Pass Failure ]
 webkit.org/b/207858 webgl/1.0.3/conformance/canvas/texture-bindings-unaffected-on-resize.html [ Pass Failure ]
 webkit.org/b/207858 webgl/1.0.3/conformance/context/context-lost-restored.html [ Pass Failure ]
 webkit.org/b/207858 webgl/1.0.3/conformance/extensions/ext-sRGB.html [ Pass Failure ]