Changeset 205399 in webkit


Ignore:
Timestamp:
Sep 3, 2016 2:44:35 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

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

Patch by Youenn Fablet <youenn@apple.com> 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:

Location:
trunk
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r205398 r205399  
     12016-09-03  Youenn Fablet  <youenn@apple.com>
     2
     3        run-webkit-tests should detect w3c test resource files
     4        https://bugs.webkit.org/show_bug.cgi?id=161307
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * TestExpectations: Removing resource files skip expectations.
     9
    1102016-09-03  Myles C. Maxfield  <mmaxfield@apple.com>
    211
  • trunk/LayoutTests/TestExpectations

    r205284 r205399  
    237237# Promises/A+ 2.3.3 has many tests and it sometimes exceeds the time limit.
    238238webkit.org/b/136878 js/promises-tests/promises-tests-2-3-3.html [ Slow ]
    239 
    240 # Resource files not in resources folder
    241 imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts-subframe.html [ Skip ]
    242 imported/w3c/web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader-subframe.html [ Skip ]
    243 imported/w3c/web-platform-tests/common/blank.html [ Skip ]
    244 imported/w3c/web-platform-tests/dom/events/EventListener-incumbent-global-subframe-1.sub.html [ Skip ]
    245 imported/w3c/web-platform-tests/dom/events/EventListener-incumbent-global-subframe-2.sub.html [ Skip ]
    246 imported/w3c/web-platform-tests/dom/events/EventListener-incumbent-global-subsubframe.sub.html [ Skip ]
    247 imported/w3c/web-platform-tests/dom/nodes/Document-createElement-namespace-tests [ Skip ]
    248 imported/w3c/web-platform-tests/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess-iframe.xml [ Skip ]
    249 imported/w3c/web-platform-tests/dom/nodes/Node-isEqualNode-iframe1.xml [ Skip ]
    250 imported/w3c/web-platform-tests/dom/nodes/Node-isEqualNode-iframe2.xml [ Skip ]
    251 imported/w3c/web-platform-tests/dom/nodes/Node-parentNode-iframe.html [ Skip ]
    252 imported/w3c/web-platform-tests/dom/nodes/ParentNode-querySelector-All-content.html [ Skip ]
    253 imported/w3c/web-platform-tests/dom/nodes/ParentNode-querySelector-All-content.xht [ Skip ]
    254 imported/w3c/web-platform-tests/dom/nodes/getElementsByClassNameFrame.htm [ Skip ]
    255 imported/w3c/web-platform-tests/dom/ranges/Range-test-iframe.html [ Skip ]
    256 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/001-1.html [ Skip ]
    257 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/001-2.html [ Skip ]
    258 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-1.html [ Skip ]
    259 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-2.html [ Skip ]
    260 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-3.html [ Skip ]
    261 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/browsing_context_name-4.html [ Skip ]
    262 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/history-traversal/unset_context_name.html [ Skip ]
    263 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/001-1.html [ Skip ]
    264 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/001-2.html [ Skip ]
    265 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/001-3.html [ Skip ]
    266 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/002-1.html [ Skip ]
    267 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/002-2.html [ Skip ]
    268 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-1.html [ Skip ]
    269 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-2.html [ Skip ]
    270 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/003-3.html [ Skip ]
    271 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004-1.html [ Skip ]
    272 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004-2.html [ Skip ]
    273 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/004-3.html [ Skip ]
    274 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/blank.html [ Skip ]
    275 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_location-1.html [ Skip ]
    276 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_location-2.html [ Skip ]
    277 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_location-3.html [ Skip ]
    278 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_submit-1.html [ Skip ]
    279 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_submit-2.html [ Skip ]
    280 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/child_navigates_parent_submit-3.html [ Skip ]
    281 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/click.html [ Skip ]
    282 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/empty_fragment_iframe.html [ Skip ]
    283 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/href.html [ Skip ]
    284 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_data_url-1.html [ Skip ]
    285 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/navigation_unload_same_origin-1.html [ Skip ]
    286 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/support [ Skip ]
    287 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/base.html [ Skip ]
    288 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back-1.html [ Skip ]
    289 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent-1.html [ Skip ]
    290 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent-2.html [ Skip ]
    291 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-1.html [ Skip ]
    292 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload-2.html [ Skip ]
    293 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/pagehide-on-history-forward-1.html [ Skip ]
    294 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-1.html [ Skip ]
    295 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/001-2.html [ Skip ]
    296 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/002-1.html [ Skip ]
    297 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-001.html [ Skip ]
    298 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-002.html [ Skip ]
    299 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-003.html [ Skip ]
    300 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-004.html [ Skip ]
    301 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-005.html [ Skip ]
    302 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/manual-006.html [ Skip ]
    303 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/prompt/next.html [ Skip ]
    304 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support [ Skip ]
    305 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/001-1.html [ Skip ]
    306 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/001-2.html [ Skip ]
    307 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/002-1.html [ Skip ]
    308 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/003-1.html [ Skip ]
    309 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/004-1.html [ Skip ]
    310 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/006-1.html [ Skip ]
    311 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/006-2.html [ Skip ]
    312 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007-1.html [ Skip ]
    313 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/007-2.html [ Skip ]
    314 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/008-1.html [ Skip ]
    315 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/009-1.html [ Skip ]
    316 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/manual-001-1.html [ Skip ]
    317 imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/unload/manual-001.html [ Skip ]
    318 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/009-1.html [ Skip ]
    319 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/009-3.html [ Skip ]
    320 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/009-5.html [ Skip ]
    321 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/010-1.html [ Skip ]
    322 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/010-3.html [ Skip ]
    323 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/010-5.html [ Skip ]
    324 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/blank.html [ Skip ]
    325 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/blank2.html [ Skip ]
    326 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/blank3.html [ Skip ]
    327 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/history_back-1.html [ Skip ]
    328 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/history_entry.html [ Skip ]
    329 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/history_forward-1.html [ Skip ]
    330 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/history_forward-2.html [ Skip ]
    331 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/history_go_no_argument-1.html [ Skip ]
    332 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/history_go_undefined-1.html [ Skip ]
    333 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/history_go_zero-1.html [ Skip ]
    334 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/001-1.html [ Skip ]
    335 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/002-1.html [ Skip ]
    336 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/joint_session_history/filler.html [ Skip ]
    337 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/non-automated [ Skip ]
    338 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_1-1.html [ Skip ]
    339 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_2-1.html [ Skip ]
    340 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_3-1.html [ Skip ]
    341 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_4-1.html [ Skip ]
    342 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_5-1.html [ Skip ]
    343 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_unload_1-1.html [ Skip ]
    344 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1-1.html [ Skip ]
    345 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_2-1.html [ Skip ]
    346 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1-1.html [ Skip ]
    347 imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2-1.html [ Skip ]
    348 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/assign_after_load-1.html [ Skip ]
    349 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/assign_after_load-2.html [ Skip ]
    350 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/assign_before_load-1.html [ Skip ]
    351 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/assign_before_load-2.html [ Skip ]
    352 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/cross_origin_joined_frame.sub.html [ Skip ]
    353 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/location_assign_about_blank-1.html [ Skip ]
    354 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/location_reload-iframe.html [ Skip ]
    355 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/non-automated [ Skip ]
    356 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/reload_document_open_write-1.html [ Skip ]
    357 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/reload_document_write-1.html [ Skip ]
    358 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/reload_document_write_onload-1.html [ Skip ]
    359 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/reload_post_1-1.html [ Skip ]
    360 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/same_origin_frame.html [ Skip ]
    361 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load-1.html [ Skip ]
    362 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_assign_during_load-2.html [ Skip ]
    363 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load-1.html [ Skip ]
    364 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load-2.html [ Skip ]
    365 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load-1.html [ Skip ]
    366 imported/w3c/web-platform-tests/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load-2.html [ Skip ]
    367 imported/w3c/web-platform-tests/html/browsers/offline/resources/html/clock.html [ Skip ]
    368 imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/frame.html [ Skip ]
    369 imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/win-documentdomain.sub.html [ Skip ]
    370 imported/w3c/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test1.html [ Skip ]
    371 imported/w3c/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test2.html [ Skip ]
    372 imported/w3c/web-platform-tests/html/browsers/the-window-object/accessing-other-browsing-contexts/test3.html [ Skip ]
    373 imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload-1.html [ Skip ]
    374 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 ]
    375 imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload-1.html [ Skip ]
    376 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 ]
    377 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 ]
    378 imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/non_automated/001.html [ Skip ]
    379 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 ]
    380 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 ]
    381 imported/w3c/web-platform-tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/non_automated/002.html [ Skip ]
    382 imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1-1.html [ Skip ]
    383 imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1-2.html [ Skip ]
    384 imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2-1.html [ Skip ]
    385 imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-1.html [ Skip ]
    386 imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-2.html [ Skip ]
    387 imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3-3.html [ Skip ]
    388 imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-1.html [ Skip ]
    389 imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-2.html [ Skip ]
    390 imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4-3.html [ Skip ]
    391 imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-1.html [ Skip ]
    392 imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_1-2.html [ Skip ]
    393 imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-1.html [ Skip ]
    394 imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-2.html [ Skip ]
    395 imported/w3c/web-platform-tests/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/non-automated/discard_iframe_history_2-3.html [ Skip ]
    396 imported/w3c/web-platform-tests/html/browsers/the-window-object/named-access-on-the-window-object/test.html [ Skip ]
    397 imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/001-1.html [ Skip ]
    398 imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/002-1.html [ Skip ]
    399 imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/existing.html [ Skip ]
    400 imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/message.html [ Skip ]
    401 imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/parent1.html [ Skip ]
    402 imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/parent2.html [ Skip ]
    403 imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/self1.html [ Skip ]
    404 imported/w3c/web-platform-tests/html/browsers/windows/browsing-context-names/self2.html [ Skip ]
    405 imported/w3c/web-platform-tests/html/browsers/windows/nested-browsing-contexts/test.html [ Skip ]
    406 imported/w3c/web-platform-tests/html/browsers/windows/nested-browsing-contexts/testcase3.html [ Skip ]
    407 imported/w3c/web-platform-tests/html/browsers/windows/noreferrer-cross-origin-close-manual.sub.html [ Skip ]
    408 imported/w3c/web-platform-tests/html/browsers/windows/noreferrer-cross-origin-window-name.sub.html [ Skip ]
    409 imported/w3c/web-platform-tests/html/browsers/windows/support-close.html [ Skip ]
    410 imported/w3c/web-platform-tests/html/browsers/windows/support-named-null-opener.html [ Skip ]
    411 imported/w3c/web-platform-tests/html/browsers/windows/support-nested-browsing-contexts.html [ Skip ]
    412 imported/w3c/web-platform-tests/html/browsers/windows/support-opener-null.html [ Skip ]
    413 imported/w3c/web-platform-tests/html/browsers/windows/support-post-to-opener.html [ Skip ]
    414 imported/w3c/web-platform-tests/html/browsers/windows/support-window-name-echo.html [ Skip ]
    415 imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/document-write/nested-document-write-1.html [ Skip ]
    416 imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/document-write/nested-document-write-2.html [ Skip ]
    417 imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/004-1.html [ Skip ]
    418 imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/010-1.html [ Skip ]
    419 imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/010-2.html [ Skip ]
    420 imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/011-1.html [ Skip ]
    421 imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/012-1.html [ Skip ]
    422 imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/013-1.html [ Skip ]
    423 imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/014-1.html [ Skip ]
    424 imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/015-1.html [ Skip ]
    425 imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/016-1.html [ Skip ]
    426 imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/document.open-03-frame.html [ Skip ]
    427 imported/w3c/web-platform-tests/html/semantics/document-metadata/the-base-element/example.html [ Skip ]
    428 imported/w3c/web-platform-tests/html/semantics/document-metadata/the-base-element/example2.html [ Skip ]
    429 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-iframe.html [ Skip ]
    430 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-embed-element/embed-in-object-fallback-subdocument.html [ Skip ]
    431 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/change_child.html [ Skip ]
    432 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/change_grandchild.html [ Skip ]
    433 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_child.html [ Skip ]
    434 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/cross_origin_grandchild.html [ Skip ]
    435 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_helper.html [ Skip ]
    436 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/same_origin_child.html [ Skip ]
    437 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/same_origin_grandchild.html [ Skip ]
    438 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/blank.htm [ Skip ]
    439 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/support/sandbox_allow_script.html [ Skip ]
    440 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/environment-changes/iframed.sub.html [ Skip ]
    441 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-iframed.sub.html [ Skip ]
    442 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-object-element/test0.html [ Skip ]
    443 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-object-element/test1.html [ Skip ]
    444 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-object-element/test2.html [ Skip ]
    445 imported/w3c/web-platform-tests/html/semantics/forms/attributes-common-to-form-controls/dirname-ltr-iframe.html [ Skip ]
    446 imported/w3c/web-platform-tests/html/semantics/forms/the-button-element/button-activate-frame.html [ Skip ]
    447 imported/w3c/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1a.html [ Skip ]
    448 imported/w3c/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1b.html [ Skip ]
    449 imported/w3c/web-platform-tests/html/semantics/grouping-content/the-ol-element/reversed-1c.html [ Skip ]
    450 imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/script-not-executed-after-shutdown-child.html [ Skip ]
    451 imported/w3c/web-platform-tests/html/semantics/selectors/pseudo-classes/focus-iframe.html [ Skip ]
    452 imported/w3c/web-platform-tests/resource-timing/iframe-setdomain.sub.html [ Skip ]
    453 
    454 imported/w3c/web-platform-tests/service-workers [ Skip ]
    455239
    456240# Skip W3C tests that are too slow in debug builds.
  • trunk/LayoutTests/imported/w3c/ChangeLog

    r205289 r205399  
     12016-09-03  Youenn Fablet  <youenn@apple.com>
     2
     3        run-webkit-tests should detect w3c test resource files
     4        https://bugs.webkit.org/show_bug.cgi?id=161307
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * resources/resource-files.json: Added.
     9
    1102016-09-01  Romain Bellessort  <romain.bellessort@crf.canon.fr>
    211
  • trunk/Tools/ChangeLog

    r205394 r205399  
     12016-09-03  Youenn Fablet  <youenn@apple.com>
     2
     3        run-webkit-tests should detect w3c test resource files
     4        https://bugs.webkit.org/show_bug.cgi?id=161307
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * Scripts/webkitpy/port/base.py:
     9        (Port.__init__): Adding self._w3c_resource_files to store the list of resource files.
     10        (Port.potential_test_names_from_expected_file):
     11        (Port._real_tests):
     12        (Port.is_w3c_resource_file): Computing whether a file is a resource file based on imported/w3c/resources/resource-files.json.
     13        (Port._is_test_file): Updated to call Port.is_w3c_resource_file. _is_test_file is no longer static.
     14        (Port): Deleted.
     15        * Scripts/webkitpy/port/base_unittest.py:
     16        (PortTest.test_additional_platform_directory):
     17        (PortTest.test_find_no_paths_specified):
     18        (PortTest.test_is_test_file): Updated to use non-static version of _is_test_file.
     19        (PortTest.test_is_w3c_resource_file): Adding tests.
     20
    1212016-09-02  Carlos Garcia Campos  <cgarcia@igalia.com>
    222
  • trunk/Tools/Scripts/webkitpy/port/base.py

    r204680 r205399  
    3131test infrastructure (the Port and Driver classes)."""
    3232
    33 import cgi
    3433import difflib
    35 import errno
    3634import itertools
     35import json
    3736import logging
    3837import os
     
    4342
    4443from collections import OrderedDict
     44from functools import partial
    4545
    4646from webkitpy.common import find_files
     
    5050from webkitpy.common.system import path
    5151from webkitpy.common.system.executive import ScriptError
    52 from webkitpy.common.system.systemhost import SystemHost
    5352from webkitpy.common.wavediff import WaveDiff
    5453from webkitpy.common.webkit_finder import WebKitFinder
     
    142141        self._jhbuild_wrapper = []
    143142        self._layout_tests_dir = hasattr(options, 'layout_tests_dir') and options.layout_tests_dir and self._filesystem.abspath(options.layout_tests_dir)
     143        self._w3c_resource_files = None
    144144
    145145    def architecture(self):
     
    536536            return None
    537537
    538         subpath = self.host.filesystem.relpath(path, self.layout_tests_dir())
    539538        if path.startswith('platform' + self._filesystem.sep):
    540539            steps = path.split(self._filesystem.sep)
     
    564563        # When collecting test cases, skip these directories
    565564        skipped_directories = set(['.svn', '_svn', 'resources', 'support', 'script-tests', 'reference', 'reftest'])
    566         files = find_files.find(self._filesystem, self.layout_tests_dir(), paths, skipped_directories, Port._is_test_file, self.test_key)
     565        files = find_files.find(self._filesystem, self.layout_tests_dir(), paths, skipped_directories, partial(Port._is_test_file, self), self.test_key)
    567566        return [self.relative_test_filename(f) for f in files]
    568567
     
    570569    _supported_test_extensions = set(['.html', '.shtml', '.xml', '.xhtml', '.pl', '.htm', '.php', '.svg', '.mht', '.xht'])
    571570    _supported_reference_extensions = set(['.html', '.xml', '.xhtml', '.htm', '.svg', '.xht'])
     571
     572    def is_w3c_resource_file(self, filesystem, dirname, filename):
     573        path = filesystem.join(dirname, filename)
     574        w3c_path = filesystem.join(self.layout_tests_dir(), "imported", "w3c")
     575        if not w3c_path in path:
     576            return False
     577
     578        if not self._w3c_resource_files:
     579            filepath = filesystem.join(w3c_path, "resources", "resource-files.json")
     580            json_data = filesystem.read_text_file(filepath)
     581            self._w3c_resource_files = json.loads(json_data)
     582
     583        subpath = path[len(w3c_path) + 1:].replace('\\', '/')
     584        if subpath in self._w3c_resource_files["files"]:
     585            return True
     586        for dirpath in self._w3c_resource_files["directories"]:
     587            if dirpath in subpath:
     588                return True
     589        return False
    572590
    573591    @staticmethod
     
    590608        return extension in Port._supported_test_extensions
    591609
    592     @staticmethod
    593     def _is_test_file(filesystem, dirname, filename):
    594         return Port._has_supported_extension(filesystem, filename) and not Port.is_reference_html_file(filesystem, dirname, filename)
     610    def _is_test_file(self, filesystem, dirname, filename):
     611        if not Port._has_supported_extension(filesystem, filename):
     612            return False
     613        if Port.is_reference_html_file(filesystem, dirname, filename):
     614            return False
     615        if self.is_w3c_resource_file(filesystem, dirname, filename):
     616            return False
     617        return True
    595618
    596619    def test_key(self, test_name):
  • trunk/Tools/Scripts/webkitpy/port/base_unittest.py

    r202362 r205399  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 import logging
    3029import optparse
    31 import sys
    3230import tempfile
    3331import unittest
    3432
    35 from webkitpy.common.system.executive import Executive, ScriptError
     33from webkitpy.common.system.executive import ScriptError
    3634from webkitpy.common.system import executive_mock
    3735from webkitpy.common.system.filesystem_mock import MockFileSystem
    3836from webkitpy.common.system.outputcapture import OutputCapture
    39 from webkitpy.common.system.path import abspath_to_uri
    40 from webkitpy.thirdparty.mock import Mock
    41 from webkitpy.tool.mocktool import MockOptions
    42 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2
     37from webkitpy.common.system.executive_mock import MockExecutive2
    4338from webkitpy.common.system.systemhost_mock import MockSystemHost
    4439
    45 from webkitpy.port import Port, Driver, DriverOutput
     40from webkitpy.port import Port
    4641from webkitpy.port.test import add_unit_tests_to_mock_filesystem, TestPort
    4742
     
    168163        port = self.make_port(port_name='foo')
    169164        port.default_baseline_search_path = lambda: ['LayoutTests/platform/foo']
    170         layout_test_dir = port.layout_tests_dir()
    171165        test_file = 'fast/test.html'
    172166
     
    239233    def test_find_no_paths_specified(self):
    240234        port = self.make_port(with_tests=True)
    241         layout_tests_dir = port.layout_tests_dir()
    242235        tests = port.tests([])
    243236        self.assertNotEqual(len(tests), 0)
     
    264257
    265258    def test_is_test_file(self):
    266         filesystem = MockFileSystem()
    267         self.assertTrue(Port._is_test_file(filesystem, '', 'foo.html'))
    268         self.assertTrue(Port._is_test_file(filesystem, '', 'foo.shtml'))
    269         self.assertTrue(Port._is_test_file(filesystem, '', 'foo.svg'))
    270         self.assertTrue(Port._is_test_file(filesystem, '', 'test-ref-test.html'))
    271         self.assertFalse(Port._is_test_file(filesystem, '', 'foo.png'))
    272         self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected.html'))
    273         self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected.svg'))
    274         self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected.xht'))
    275         self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected-mismatch.html'))
    276         self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected-mismatch.svg'))
    277         self.assertFalse(Port._is_test_file(filesystem, '', 'foo-expected-mismatch.xhtml'))
    278         self.assertFalse(Port._is_test_file(filesystem, '', 'foo-ref.html'))
    279         self.assertFalse(Port._is_test_file(filesystem, '', 'foo-notref.html'))
    280         self.assertFalse(Port._is_test_file(filesystem, '', 'foo-notref.xht'))
    281         self.assertFalse(Port._is_test_file(filesystem, '', 'foo-ref.xhtml'))
    282         self.assertFalse(Port._is_test_file(filesystem, '', 'ref-foo.html'))
    283         self.assertFalse(Port._is_test_file(filesystem, '', 'notref-foo.xhr'))
     259        port = self.make_port()
     260        self.assertTrue(port._is_test_file(port.host.filesystem, '', 'foo.html'))
     261        self.assertTrue(port._is_test_file(port.host.filesystem, '', 'foo.shtml'))
     262        self.assertTrue(port._is_test_file(port.host.filesystem, '', 'foo.svg'))
     263        self.assertTrue(port._is_test_file(port.host.filesystem, '', 'test-ref-test.html'))
     264        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo.png'))
     265        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-expected.html'))
     266        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-expected.svg'))
     267        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-expected.xht'))
     268        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-expected-mismatch.html'))
     269        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-expected-mismatch.svg'))
     270        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-expected-mismatch.xhtml'))
     271        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-ref.html'))
     272        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-notref.html'))
     273        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-notref.xht'))
     274        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'foo-ref.xhtml'))
     275        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'ref-foo.html'))
     276        self.assertFalse(port._is_test_file(port.host.filesystem, '', 'notref-foo.xhr'))
    284277
    285278    def test_is_reference_html_file(self):
     
    379372            self.assertEqual(port._build_path(), '/my-build-directory/Release')
    380373
     374    def test_is_w3c_resource_file(self):
     375        port = self.make_port()
     376        port.host.filesystem.write_text_file(port.layout_tests_dir() + "/imported/w3c/resources/resource-files.json", """
     377{"directories": [
     378"web-platform-tests/common",
     379"web-platform-tests/dom/nodes/Document-createElement-namespace-tests",
     380"web-platform-tests/fonts",
     381"web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/source/support",
     382"web-platform-tests/html/browsers/browsing-the-web/unloading-documents/support",
     383"web-platform-tests/html/browsers/history/the-history-interface/non-automated",
     384"web-platform-tests/html/browsers/history/the-location-interface/non-automated",
     385"web-platform-tests/images",
     386"web-platform-tests/service-workers",
     387"web-platform-tests/tools"
     388], "files": [
     389"web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-block-defer-scripts-subframe.html",
     390"web-platform-tests/XMLHttpRequest/xmlhttprequest-sync-not-hang-scriptloader-subframe.html"
     391]}""")
     392        self.assertFalse(port.is_w3c_resource_file(port.host.filesystem, port.layout_tests_dir() + "/imported/w3", "resource_file.html"))
     393        self.assertFalse(port.is_w3c_resource_file(port.host.filesystem, port.layout_tests_dir() + "/imported/w3c", "resource_file.html"))
     394        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"))
     395        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"))
     396        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"))
    381397
    382398class NaturalCompareTest(unittest.TestCase):
Note: See TracChangeset for help on using the changeset viewer.