Title: [218635] trunk/LayoutTests/imported/w3c
- Revision
- 218635
- Author
- [email protected]
- Date
- 2017-06-21 09:19:10 -0700 (Wed, 21 Jun 2017)
Log Message
LayoutTests/imported/w3c/resources/import-expectations.json is broken after http://trac.webkit.org/changeset/218181
https://bugs.webkit.org/show_bug.cgi?id=173651
Patch by Youenn Fablet <[email protected]> on 2017-06-21
Reviewed by Chris Dumez.
* resources/import-expectations.json: Fix the merge.
Modified Paths
Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (218634 => 218635)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-06-21 16:04:51 UTC (rev 218634)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-06-21 16:19:10 UTC (rev 218635)
@@ -1,3 +1,12 @@
+2017-06-21 Youenn Fablet <[email protected]>
+
+ LayoutTests/imported/w3c/resources/import-expectations.json is broken after http://trac.webkit.org/changeset/218181
+ https://bugs.webkit.org/show_bug.cgi?id=173651
+
+ Reviewed by Chris Dumez.
+
+ * resources/import-expectations.json: Fix the merge.
+
2017-06-19 Sam Weinig <[email protected]>
[WebIDL] Properly model buffer source / typed arrays as their own IDL types
Modified: trunk/LayoutTests/imported/w3c/resources/import-expectations.json (218634 => 218635)
--- trunk/LayoutTests/imported/w3c/resources/import-expectations.json 2017-06-21 16:04:51 UTC (rev 218634)
+++ trunk/LayoutTests/imported/w3c/resources/import-expectations.json 2017-06-21 16:19:10 UTC (rev 218635)
@@ -259,14 +259,9 @@
"web-platform-tests/remote-playback": "skip",
"web-platform-tests/resource-timing": "import",
"web-platform-tests/screen-orientation": "skip",
-<<<<<<< HEAD
"web-platform-tests/secure-contexts": "import",
-=======
"web-platform-tests/scroll-anchoring": "skip",
"web-platform-tests/scroll-into-view": "skip",
- "web-platform-tests/secure-contexts": "skip",
->>>>>>> refreshing wpt tests
- "web-platform-tests/secure_context": "skip",
"web-platform-tests/selection": "skip",
"web-platform-tests/selectors": "skip",
"web-platform-tests/selectors-api": "skip",
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
