Title: [256897] trunk/LayoutTests
Revision
256897
Author
ryanhad...@apple.com
Date
2020-02-18 17:34:28 -0800 (Tue, 18 Feb 2020)

Log Message

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:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (256896 => 256897)


--- trunk/LayoutTests/ChangeLog	2020-02-19 01:29:57 UTC (rev 256896)
+++ trunk/LayoutTests/ChangeLog	2020-02-19 01:34:28 UTC (rev 256897)
@@ -1,3 +1,17 @@
+2020-02-18  Ryan Haddad  <ryanhad...@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  <za...@apple.com>
 
         [LFC][IFC] Replaced elements can also establish formatting contexts.

Modified: trunk/LayoutTests/platform/ios/TestExpectations (256896 => 256897)


--- trunk/LayoutTests/platform/ios/TestExpectations	2020-02-19 01:29:57 UTC (rev 256896)
+++ trunk/LayoutTests/platform/ios/TestExpectations	2020-02-19 01:34:28 UTC (rev 256897)
@@ -3513,6 +3513,8 @@
 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 ]

Modified: trunk/LayoutTests/platform/ios-wk2/TestExpectations (256896 => 256897)


--- trunk/LayoutTests/platform/ios-wk2/TestExpectations	2020-02-19 01:29:57 UTC (rev 256896)
+++ trunk/LayoutTests/platform/ios-wk2/TestExpectations	2020-02-19 01:34:28 UTC (rev 256897)
@@ -1416,14 +1416,4 @@
 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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to