Title: [205399] trunk
Revision
205399
Author
[email protected]
Date
2016-09-03 02:44:35 -0700 (Sat, 03 Sep 2016)

Log Message

run-webkit-tests should detect w3c test resource files
https://bugs.webkit.org/show_bug.cgi?id=161307

Patch by Youenn Fablet <[email protected]> on 2016-09-03
Reviewed by Ryosuke Niwa.

LayoutTests/imported/w3c:

* resources/resource-files.json: Added.

Tools:

* Scripts/webkitpy/port/base.py:
(Port.__init__): Adding self._w3c_resource_files to store the list of resource files.
(Port.potential_test_names_from_expected_file):
(Port._real_tests):
(Port.is_w3c_resource_file): Computing whether a file is a resource file based on imported/w3c/resources/resource-files.json.
(Port._is_test_file): Updated to call Port.is_w3c_resource_file. _is_test_file is no longer static.
(Port): Deleted.
* Scripts/webkitpy/port/base_unittest.py:
(PortTest.test_additional_platform_directory):
(PortTest.test_find_no_paths_specified):
(PortTest.test_is_test_file): Updated to use non-static version of _is_test_file.
(PortTest.test_is_w3c_resource_file): Adding tests.

LayoutTests:

* TestExpectations: Removing resource files skip expectations.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (205398 => 205399)


--- trunk/LayoutTests/ChangeLog	2016-09-03 07:40:26 UTC (rev 205398)
+++ trunk/LayoutTests/ChangeLog	2016-09-03 09:44:35 UTC (rev 205399)
@@ -1,3 +1,12 @@
+2016-09-03  Youenn Fablet  <[email protected]>
+
+        run-webkit-tests should detect w3c test resource files
+        https://bugs.webkit.org/show_bug.cgi?id=161307
+
+        Reviewed by Ryosuke Niwa.
+
+        * TestExpectations: Removing resource files skip expectations.
+
 2016-09-03  Myles C. Maxfield  <[email protected]>
 
         [Cocoa] Distinguish between paint advances and base advances

Modified: trunk/LayoutTests/TestExpectations (205398 => 205399)


--- trunk/LayoutTests/TestExpectations	2016-09-03 07:40:26 UTC (rev 205398)
+++ trunk/LayoutTests/TestExpectations	2016-09-03 09:44:35 UTC (rev 205399)
@@ -237,222 +237,6 @@
 # Promises/A+ 2.3.3 has many tests and it sometimes exceeds the time limit. 
 webkit.org/b/136878 js/promises-tests/promises-tests-2-3-3.html [ Slow ]
 
-# Resource files not in resources folder
-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts-subframe.html [ Skip ]
-imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader-subframe.html [ Skip ]
-imported/w3c/web-platform-tests/common/blank.html [ Skip ]
-imported/w3c/web-platform-tests/dom/events/EventListener-incumbent-global-subframe-1.sub.html [ Skip ]
-imported/w3c/web-platform-tests/dom/events/EventListener-incumbent-global-subframe-2.sub.html [ Skip ]
-imported/w3c/web-platform-tests/dom/events/EventListener-incumbent-global-subsubframe.sub.html [ Skip ]
-imported/w3c/web-platform-tests/dom/nodes/Document-createElement-namespace-tests [ Skip ]
-imported/w3c/web-platform-tests/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess-iframe.xml [ Skip ]
-imported/w3c/web-platform-tests/dom/nodes/Node-isEqualNode-iframe1.xml [ Skip ]
-imported/w3c/web-platform-tests/dom/nodes/Node-isEqualNode-iframe2.xml [ Skip ]
-imported/w3c/web-platform-tests/dom/nodes/Node-parentNode-iframe.html [ Skip ]
-imported/w3c/web-platform-tests/dom/nodes/ParentNode-querySelector-All-content.html [ Skip ]
-imported/w3c/web-platform-tests/dom/nodes/ParentNode-querySelector-All-content.xht [ Skip ]
-imported/w3c/web-platform-tests/dom/nodes/getElementsByClassNameFrame.htm [ Skip ]
-imported/w3c/web-platform-tests/dom/ranges/Range-test-iframe.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/001-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/001-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-3.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-4.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/unset_context_name.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/001-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/001-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/001-3.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/002-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/002-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-3.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004-3.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/blank.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_location-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_location-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_location-3.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_submit-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_submit-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_submit-3.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/click.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/empty_fragment_iframe.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/href.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_data_url-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_same_origin-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/support [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/base.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/pagehide-on-history-forward-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/002-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-001.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-002.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-003.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-004.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-005.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-006.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/next.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/001-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/001-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/002-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/003-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/004-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/006-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/006-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/008-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/009-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/manual-001-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/manual-001.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/009-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/009-3.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/009-5.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/010-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/010-3.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/010-5.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/blank.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/blank2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/blank3.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/history_back-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/history_entry.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/history_forward-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/history_forward-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/history_go_no_argument-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/history_go_undefined-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/history_go_zero-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/001-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/002-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/filler.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/non-automated [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_1-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_2-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_3-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_4-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_5-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_unload_1-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_2-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/assign_after_load-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/assign_after_load-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/assign_before_load-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/assign_before_load-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/cross_origin_joined_frame.sub.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/location_assign_about_blank-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/location_reload-iframe.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/non-automated [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/reload_document_open_write-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/reload_document_write-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/reload_document_write_onload-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/reload_post_1-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/same_origin_frame.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/offline/resources/html/clock.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/frame.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/win-documentdomain.sub.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test3.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_script_defer-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/non_automated/001-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/non_automated/001-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/non_automated/001.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/non_automated/002-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/non_automated/002-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/non_automated/002.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-3.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-3.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-3.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/test.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/001-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/002-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/existing.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/message.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/parent1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/parent2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/self1.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/self2.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/nested-browsing-contexts/test.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/nested-browsing-contexts/testcase3.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/noreferrer-cross-origin-close-manual.sub.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/noreferrer-cross-origin-window-name.sub.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/support-close.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/support-named-null-opener.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/support-nested-browsing-contexts.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/support-opener-null.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/support-post-to-opener.html [ Skip ]
-imported/w3c/web-platform-tests/html/browsers/windows/support-window-name-echo.html [ Skip ]
-imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/document-write/nested-document-write-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/document-write/nested-document-write-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/004-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/010-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/010-2.html [ Skip ]
-imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/011-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/012-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/013-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/014-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/015-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/016-1.html [ Skip ]
-imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-03-frame.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/document-metadata/the-base-element/example.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/document-metadata/the-base-element/example2.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-iframe.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback-subdocument.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/change_child.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/change_grandchild.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_child.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_grandchild.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/same_origin_child.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/same_origin_grandchild.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/blank.htm [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/sandbox_allow_script.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/environment-changes/iframed.sub.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-iframed.sub.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-object-element/test0.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-object-element/test1.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-object-element/test2.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-ltr-iframe.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/forms/the-button-element/button-activate-frame.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1a.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1b.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1c.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/script-not-executed-after-shutdown-child.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/selectors/pseudo-classes/focus-iframe.html [ Skip ]
-imported/w3c/web-platform-tests/resource-timing/iframe-setdomain.sub.html [ Skip ]
-
-imported/w3c/web-platform-tests/service-workers [ Skip ]
-
 # Skip W3C tests that are too slow in debug builds.
 webkit.org/b/148546 [ Debug ] imported/w3c/web-platform-tests/dom/interfaces.html [ Skip ]
 webkit.org/b/148546 [ Debug ] imported/w3c/web-platform-tests/dom/ranges/Range-compareBoundaryPoints.html [ Skip ]

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (205398 => 205399)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2016-09-03 07:40:26 UTC (rev 205398)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2016-09-03 09:44:35 UTC (rev 205399)
@@ -1,3 +1,12 @@
+2016-09-03  Youenn Fablet  <[email protected]>
+
+        run-webkit-tests should detect w3c test resource files
+        https://bugs.webkit.org/show_bug.cgi?id=161307
+
+        Reviewed by Ryosuke Niwa.
+
+        * resources/resource-files.json: Added.
+
 2016-09-01  Romain Bellessort  <[email protected]>
 
         [Streams API] Align internal structure of ReadableStream with spec

Added: trunk/LayoutTests/imported/w3c/resources/resource-files.json (0 => 205399)


--- trunk/LayoutTests/imported/w3c/resources/resource-files.json	                        (rev 0)
+++ trunk/LayoutTests/imported/w3c/resources/resource-files.json	2016-09-03 09:44:35 UTC (rev 205399)
@@ -0,0 +1,219 @@
+{"directories": [
+"web-platform-tests/common",
+"web-platform-tests/dom/nodes/Document-createElement-namespace-tests",
+"web-platform-tests/fonts",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/support",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support",
+"web-platform-tests/html/browsers/history/the-history-interface/non-automated",
+"web-platform-tests/html/browsers/history/the-location-interface/non-automated",
+"web-platform-tests/images",
+"web-platform-tests/service-workers",
+"web-platform-tests/tools"
+], "files": [
+"web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts-subframe.html",
+"web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader-subframe.html",
+"web-platform-tests/dom/events/EventListener-incumbent-global-subframe-1.sub.html",
+"web-platform-tests/dom/events/EventListener-incumbent-global-subframe-2.sub.html",
+"web-platform-tests/dom/events/EventListener-incumbent-global-subsubframe.sub.html",
+"web-platform-tests/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess-iframe.xml",
+"web-platform-tests/dom/nodes/Node-isEqualNode-iframe1.xml",
+"web-platform-tests/dom/nodes/Node-isEqualNode-iframe2.xml",
+"web-platform-tests/dom/nodes/Node-parentNode-iframe.html",
+"web-platform-tests/dom/nodes/ParentNode-querySelector-All-content.html",
+"web-platform-tests/dom/nodes/ParentNode-querySelector-All-content.xht",
+"web-platform-tests/dom/nodes/getElementsByClassNameFrame.htm",
+"web-platform-tests/dom/ranges/Range-test-iframe.html",
+"web-platform-tests/html/browsers/browsing-the-web/history-traversal/001-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/history-traversal/001-2.html",
+"web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-2.html",
+"web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-3.html",
+"web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-4.html",
+"web-platform-tests/html/browsers/browsing-the-web/history-traversal/unset_context_name.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/001-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/001-2.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/001-3.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/002-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/002-2.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-2.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-3.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004-2.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004-3.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/blank.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_location-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_location-2.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_location-3.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_submit-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_submit-2.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_submit-3.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/click.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/empty_fragment_iframe.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/href.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_data_url-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_same_origin-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/base.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent-2.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-2.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/pagehide-on-history-forward-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-2.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/002-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-001.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-002.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-003.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-004.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-005.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-006.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/next.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/001-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/001-2.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/002-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/003-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/004-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/006-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/006-2.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007-2.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/008-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/009-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/manual-001-1.html",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/manual-001.html",
+"web-platform-tests/html/browsers/history/the-history-interface/009-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/009-3.html",
+"web-platform-tests/html/browsers/history/the-history-interface/009-5.html",
+"web-platform-tests/html/browsers/history/the-history-interface/010-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/010-3.html",
+"web-platform-tests/html/browsers/history/the-history-interface/010-5.html",
+"web-platform-tests/html/browsers/history/the-history-interface/blank.html",
+"web-platform-tests/html/browsers/history/the-history-interface/blank2.html",
+"web-platform-tests/html/browsers/history/the-history-interface/blank3.html",
+"web-platform-tests/html/browsers/history/the-history-interface/history_back-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/history_entry.html",
+"web-platform-tests/html/browsers/history/the-history-interface/history_forward-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/history_forward-2.html",
+"web-platform-tests/html/browsers/history/the-history-interface/history_go_no_argument-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/history_go_undefined-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/history_go_zero-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/001-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/002-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/filler.html",
+"web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_1-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_2-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_3-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_4-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_5-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_unload_1-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_2-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1-1.html",
+"web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2-1.html",
+"web-platform-tests/html/browsers/history/the-location-interface/assign_after_load-1.html",
+"web-platform-tests/html/browsers/history/the-location-interface/assign_after_load-2.html",
+"web-platform-tests/html/browsers/history/the-location-interface/assign_before_load-1.html",
+"web-platform-tests/html/browsers/history/the-location-interface/assign_before_load-2.html",
+"web-platform-tests/html/browsers/history/the-location-interface/cross_origin_joined_frame.sub.html",
+"web-platform-tests/html/browsers/history/the-location-interface/location_assign_about_blank-1.html",
+"web-platform-tests/html/browsers/history/the-location-interface/location_reload-iframe.html",
+"web-platform-tests/html/browsers/history/the-location-interface/reload_document_open_write-1.html",
+"web-platform-tests/html/browsers/history/the-location-interface/reload_document_write-1.html",
+"web-platform-tests/html/browsers/history/the-location-interface/reload_document_write_onload-1.html",
+"web-platform-tests/html/browsers/history/the-location-interface/reload_post_1-1.html",
+"web-platform-tests/html/browsers/history/the-location-interface/same_origin_frame.html",
+"web-platform-tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load-1.html",
+"web-platform-tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load-2.html",
+"web-platform-tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load-1.html",
+"web-platform-tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load-2.html",
+"web-platform-tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load-1.html",
+"web-platform-tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load-2.html",
+"web-platform-tests/html/browsers/offline/resources/html/clock.html",
+"web-platform-tests/html/browsers/origin/cross-origin-objects/frame.html",
+"web-platform-tests/html/browsers/origin/cross-origin-objects/win-documentdomain.sub.html",
+"web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test1.html",
+"web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test2.html",
+"web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test3.html",
+"web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload-1.html",
+"web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_script_defer-1.html",
+"web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload-1.html",
+"web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/non_automated/001-1.html",
+"web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/non_automated/001-2.html",
+"web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/non_automated/001.html",
+"web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/non_automated/002-1.html",
+"web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/non_automated/002-2.html",
+"web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/non_automated/002.html",
+"web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1-1.html",
+"web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1-2.html",
+"web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2-1.html",
+"web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-1.html",
+"web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-2.html",
+"web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-3.html",
+"web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-1.html",
+"web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-2.html",
+"web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-3.html",
+"web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-1.html",
+"web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-2.html",
+"web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-1.html",
+"web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-2.html",
+"web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-3.html",
+"web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/test.html",
+"web-platform-tests/html/browsers/windows/browsing-context-names/001-1.html",
+"web-platform-tests/html/browsers/windows/browsing-context-names/002-1.html",
+"web-platform-tests/html/browsers/windows/browsing-context-names/existing.html",
+"web-platform-tests/html/browsers/windows/browsing-context-names/message.html",
+"web-platform-tests/html/browsers/windows/browsing-context-names/parent1.html",
+"web-platform-tests/html/browsers/windows/browsing-context-names/parent2.html",
+"web-platform-tests/html/browsers/windows/browsing-context-names/self1.html",
+"web-platform-tests/html/browsers/windows/browsing-context-names/self2.html",
+"web-platform-tests/html/browsers/windows/nested-browsing-contexts/test.html",
+"web-platform-tests/html/browsers/windows/nested-browsing-contexts/testcase3.html",
+"web-platform-tests/html/browsers/windows/noreferrer-cross-origin-close-manual.sub.html",
+"web-platform-tests/html/browsers/windows/noreferrer-cross-origin-window-name.sub.html",
+"web-platform-tests/html/browsers/windows/support-close.html",
+"web-platform-tests/html/browsers/windows/support-named-null-opener.html",
+"web-platform-tests/html/browsers/windows/support-nested-browsing-contexts.html",
+"web-platform-tests/html/browsers/windows/support-opener-null.html",
+"web-platform-tests/html/browsers/windows/support-post-to-opener.html",
+"web-platform-tests/html/browsers/windows/support-window-name-echo.html",
+"web-platform-tests/html/dom/dynamic-markup-insertion/document-write/nested-document-write-1.html",
+"web-platform-tests/html/dom/dynamic-markup-insertion/document-write/nested-document-write-2.html",
+"web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/004-1.html",
+"web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/010-1.html",
+"web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/010-2.html",
+"web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/011-1.html",
+"web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/012-1.html",
+"web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/013-1.html",
+"web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/014-1.html",
+"web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/015-1.html",
+"web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/016-1.html",
+"web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-03-frame.html",
+"web-platform-tests/html/semantics/document-metadata/the-base-element/example.html",
+"web-platform-tests/html/semantics/document-metadata/the-base-element/example2.html",
+"web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-iframe.html",
+"web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback-subdocument.html",
+"web-platform-tests/html/semantics/embedded-content/the-iframe-element/change_child.html",
+"web-platform-tests/html/semantics/embedded-content/the-iframe-element/change_grandchild.html",
+"web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_child.html",
+"web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_grandchild.html",
+"web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper.html",
+"web-platform-tests/html/semantics/embedded-content/the-iframe-element/same_origin_child.html",
+"web-platform-tests/html/semantics/embedded-content/the-iframe-element/same_origin_grandchild.html",
+"web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/blank.htm",
+"web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/sandbox_allow_script.html",
+"web-platform-tests/html/semantics/embedded-content/the-img-element/environment-changes/iframed.sub.html",
+"web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-iframed.sub.html",
+"web-platform-tests/html/semantics/embedded-content/the-object-element/test0.html",
+"web-platform-tests/html/semantics/embedded-content/the-object-element/test1.html",
+"web-platform-tests/html/semantics/embedded-content/the-object-element/test2.html",
+"web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-ltr-iframe.html",
+"web-platform-tests/html/semantics/forms/the-button-element/button-activate-frame.html",
+"web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1a.html",
+"web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1b.html",
+"web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1c.html",
+"web-platform-tests/html/semantics/scripting-1/the-script-element/script-not-executed-after-shutdown-child.html",
+"web-platform-tests/html/semantics/selectors/pseudo-classes/focus-iframe.html",
+"web-platform-tests/resource-timing/iframe-setdomain.sub.html"
+]}

Modified: trunk/Tools/ChangeLog (205398 => 205399)


--- trunk/Tools/ChangeLog	2016-09-03 07:40:26 UTC (rev 205398)
+++ trunk/Tools/ChangeLog	2016-09-03 09:44:35 UTC (rev 205399)
@@ -1,3 +1,23 @@
+2016-09-03  Youenn Fablet  <[email protected]>
+
+        run-webkit-tests should detect w3c test resource files
+        https://bugs.webkit.org/show_bug.cgi?id=161307
+
+        Reviewed by Ryosuke Niwa.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port.__init__): Adding self._w3c_resource_files to store the list of resource files.
+        (Port.potential_test_names_from_expected_file):
+        (Port._real_tests):
+        (Port.is_w3c_resource_file): Computing whether a file is a resource file based on imported/w3c/resources/resource-files.json.
+        (Port._is_test_file): Updated to call Port.is_w3c_resource_file. _is_test_file is no longer static.
+        (Port): Deleted.
+        * Scripts/webkitpy/port/base_unittest.py:
+        (PortTest.test_additional_platform_directory):
+        (PortTest.test_find_no_paths_specified):
+        (PortTest.test_is_test_file): Updated to use non-static version of _is_test_file.
+        (PortTest.test_is_w3c_resource_file): Adding tests.
+
 2016-09-02  Carlos Garcia Campos  <[email protected]>
 
         Unreviewed. Fix archive-built-product step in GTK+ bots after r205280.

Modified: trunk/Tools/Scripts/webkitpy/port/base.py (205398 => 205399)


--- trunk/Tools/Scripts/webkitpy/port/base.py	2016-09-03 07:40:26 UTC (rev 205398)
+++ trunk/Tools/Scripts/webkitpy/port/base.py	2016-09-03 09:44:35 UTC (rev 205399)
@@ -30,10 +30,9 @@
 """Abstract base class of Port-specific entry points for the layout tests
 test infrastructure (the Port and Driver classes)."""
 
-import cgi
 import difflib
-import errno
 import itertools
+import json
 import logging
 import os
 import operator
@@ -42,6 +41,7 @@
 import sys
 
 from collections import OrderedDict
+from functools import partial
 
 from webkitpy.common import find_files
 from webkitpy.common import read_checksum_from_png
@@ -49,7 +49,6 @@
 from webkitpy.common.prettypatch import PrettyPatch
 from webkitpy.common.system import path
 from webkitpy.common.system.executive import ScriptError
-from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.common.wavediff import WaveDiff
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
@@ -141,6 +140,7 @@
         self._root_was_set = hasattr(options, 'root') and options.root
         self._jhbuild_wrapper = []
         self._layout_tests_dir = hasattr(options, 'layout_tests_dir') and options.layout_tests_dir and self._filesystem.abspath(options.layout_tests_dir)
+        self._w3c_resource_files = None
 
     def architecture(self):
         return self.get_option('architecture')
@@ -535,7 +535,6 @@
         if not '-expected.' in path:
             return None
 
-        subpath = self.host.filesystem.relpath(path, self.layout_tests_dir())
         if path.startswith('platform' + self._filesystem.sep):
             steps = path.split(self._filesystem.sep)
             path = self._filesystem.join(self._filesystem.sep.join(steps[2:]))
@@ -563,7 +562,7 @@
     def _real_tests(self, paths):
         # When collecting test cases, skip these directories
         skipped_directories = set(['.svn', '_svn', 'resources', 'support', 'script-tests', 'reference', 'reftest'])
-        files = find_files.find(self._filesystem, self.layout_tests_dir(), paths, skipped_directories, Port._is_test_file, self.test_key)
+        files = find_files.find(self._filesystem, self.layout_tests_dir(), paths, skipped_directories, partial(Port._is_test_file, self), self.test_key)
         return [self.relative_test_filename(f) for f in files]
 
     # When collecting test cases, we include any file with these extensions.
@@ -570,6 +569,25 @@
     _supported_test_extensions = set(['.html', '.shtml', '.xml', '.xhtml', '.pl', '.htm', '.php', '.svg', '.mht', '.xht'])
     _supported_reference_extensions = set(['.html', '.xml', '.xhtml', '.htm', '.svg', '.xht'])
 
+    def is_w3c_resource_file(self, filesystem, dirname, filename):
+        path = filesystem.join(dirname, filename)
+        w3c_path = filesystem.join(self.layout_tests_dir(), "imported", "w3c")
+        if not w3c_path in path:
+            return False
+
+        if not self._w3c_resource_files:
+            filepath = filesystem.join(w3c_path, "resources", "resource-files.json")
+            json_data = filesystem.read_text_file(filepath)
+            self._w3c_resource_files = json.loads(json_data)
+
+        subpath = path[len(w3c_path) + 1:].replace('\\', '/')
+        if subpath in self._w3c_resource_files["files"]:
+            return True
+        for dirpath in self._w3c_resource_files["directories"]:
+            if dirpath in subpath:
+                return True
+        return False
+
     @staticmethod
     # If any changes are made here be sure to update the isUsedInReftest method in old-run-webkit-tests as well.
     def is_reference_html_file(filesystem, dirname, filename):
@@ -589,9 +607,14 @@
         extension = filesystem.splitext(filename)[1]
         return extension in Port._supported_test_extensions
 
-    @staticmethod
-    def _is_test_file(filesystem, dirname, filename):
-        return Port._has_supported_extension(filesystem, filename) and not Port.is_reference_html_file(filesystem, dirname, filename)
+    def _is_test_file(self, filesystem, dirname, filename):
+        if not Port._has_supported_extension(filesystem, filename):
+            return False
+        if Port.is_reference_html_file(filesystem, dirname, filename):
+            return False
+        if self.is_w3c_resource_file(filesystem, dirname, filename):
+            return False
+        return True
 
     def test_key(self, test_name):
         """Turns a test name into a list with two sublists, the natural key of the

Modified: trunk/Tools/Scripts/webkitpy/port/base_unittest.py (205398 => 205399)


--- trunk/Tools/Scripts/webkitpy/port/base_unittest.py	2016-09-03 07:40:26 UTC (rev 205398)
+++ trunk/Tools/Scripts/webkitpy/port/base_unittest.py	2016-09-03 09:44:35 UTC (rev 205399)
@@ -26,23 +26,18 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import logging
 import optparse
-import sys
 import tempfile
 import unittest
 
-from webkitpy.common.system.executive import Executive, ScriptError
+from webkitpy.common.system.executive import ScriptError
 from webkitpy.common.system import executive_mock
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.common.system.path import abspath_to_uri
-from webkitpy.thirdparty.mock import Mock
-from webkitpy.tool.mocktool import MockOptions
-from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2
+from webkitpy.common.system.executive_mock import MockExecutive2
 from webkitpy.common.system.systemhost_mock import MockSystemHost
 
-from webkitpy.port import Port, Driver, DriverOutput
+from webkitpy.port import Port
 from webkitpy.port.test import add_unit_tests_to_mock_filesystem, TestPort
 
 
@@ -167,7 +162,6 @@
     def test_additional_platform_directory(self):
         port = self.make_port(port_name='foo')
         port.default_baseline_search_path = lambda: ['LayoutTests/platform/foo']
-        layout_test_dir = port.layout_tests_dir()
         test_file = 'fast/test.html'
 
         # No additional platform directory
@@ -238,7 +232,6 @@
 
     def test_find_no_paths_specified(self):
         port = self.make_port(with_tests=True)
-        layout_tests_dir = port.layout_tests_dir()
         tests = port.tests([])
         self.assertNotEqual(len(tests), 0)
 
@@ -263,24 +256,24 @@
         self.assertEqual(tests, [])
 
     def test_is_test_file(self):
-        filesystem = MockFileSystem()
-        self.assertTrue(Port._is_test_file(filesystem, '', 'foo.html'))
-        self.assertTrue(Port._is_test_file(filesystem, '', 'foo.shtml'))
-        self.assertTrue(Port._is_test_file(filesystem, '', 'foo.svg'))
-        self.assertTrue(Port._is_test_file(filesystem, '', 'test-ref-test.html'))
-        self.assertFalse(Port._is_test_file(filesystem, '', 'foo.png'))
-        self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected.html'))
-        self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected.svg'))
-        self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected.xht'))
-        self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected-mismatch.html'))
-        self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected-mismatch.svg'))
-        self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected-mismatch.xhtml'))
-        self.assertFalse(Port._is_test_file(filesystem, '', 'foo-ref.html'))
-        self.assertFalse(Port._is_test_file(filesystem, '', 'foo-notref.html'))
-        self.assertFalse(Port._is_test_file(filesystem, '', 'foo-notref.xht'))
-        self.assertFalse(Port._is_test_file(filesystem, '', 'foo-ref.xhtml'))
-        self.assertFalse(Port._is_test_file(filesystem, '', 'ref-foo.html'))
-        self.assertFalse(Port._is_test_file(filesystem, '', 'notref-foo.xhr'))
+        port = self.make_port()
+        self.assertTrue(port._is_test_file(port.host.filesystem, '', 'foo.html'))
+        self.assertTrue(port._is_test_file(port.host.filesystem, '', 'foo.shtml'))
+        self.assertTrue(port._is_test_file(port.host.filesystem, '', 'foo.svg'))
+        self.assertTrue(port._is_test_file(port.host.filesystem, '', 'test-ref-test.html'))
+        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo.png'))
+        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-expected.html'))
+        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-expected.svg'))
+        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-expected.xht'))
+        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-expected-mismatch.html'))
+        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-expected-mismatch.svg'))
+        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-expected-mismatch.xhtml'))
+        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-ref.html'))
+        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-notref.html'))
+        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-notref.xht'))
+        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-ref.xhtml'))
+        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'ref-foo.html'))
+        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'notref-foo.xhr'))
 
     def test_is_reference_html_file(self):
         filesystem = MockFileSystem()
@@ -378,6 +371,29 @@
         else:
             self.assertEqual(port._build_path(), '/my-build-directory/Release')
 
+    def test_is_w3c_resource_file(self):
+        port = self.make_port()
+        port.host.filesystem.write_text_file(port.layout_tests_dir() + "/imported/w3c/resources/resource-files.json", """
+{"directories": [
+"web-platform-tests/common",
+"web-platform-tests/dom/nodes/Document-createElement-namespace-tests",
+"web-platform-tests/fonts",
+"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/support",
+"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support",
+"web-platform-tests/html/browsers/history/the-history-interface/non-automated",
+"web-platform-tests/html/browsers/history/the-location-interface/non-automated",
+"web-platform-tests/images",
+"web-platform-tests/service-workers",
+"web-platform-tests/tools"
+], "files": [
+"web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts-subframe.html",
+"web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader-subframe.html"
+]}""")
+        self.assertFalse(port.is_w3c_resource_file(port.host.filesystem, port.layout_tests_dir() + "/imported/w3", "resource_file.html"))
+        self.assertFalse(port.is_w3c_resource_file(port.host.filesystem, port.layout_tests_dir() + "/imported/w3c", "resource_file.html"))
+        self.assertFalse(port.is_w3c_resource_file(port.host.filesystem, port.layout_tests_dir() + "/imported/w3c/web-platform-tests/XMLHttpRequest", "xmlhttprequest-sync-block-defer-scripts-subframe.html.html"))
+        self.assertTrue(port.is_w3c_resource_file(port.host.filesystem, port.layout_tests_dir() + "/imported/w3c/web-platform-tests/XMLHttpRequest", "xmlhttprequest-sync-block-defer-scripts-subframe.html"))
+        self.assertTrue(port.is_w3c_resource_file(port.host.filesystem, port.layout_tests_dir() + "/imported/w3c/web-platform-tests/dom/nodes/Document-createElement-namespace-tests", "test.html"))
 
 class NaturalCompareTest(unittest.TestCase):
     def setUp(self):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to