Move non-upstreamed Resource Timing tests out of web-platform-tests
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Sep 2017 04:41:42 +0000 (04:41 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Sep 2017 04:41:42 +0000 (04:41 +0000)
https://bugs.webkit.org/show_bug.cgi?id=177197

Patch by Joseph Pecoraro <pecoraro@apple.com> on 2017-09-19
Reviewed by Youenn Fablet.

LayoutTests/imported/w3c:

* web-platform-tests/resource-timing/rt-*:
These are not upstream, move them out to http/wpt.

LayoutTests:

* TestExpectations:
* platform/gtk/TestExpectations:
* platform/mac-wk1/TestExpectations:
* platform/mac/TestExpectations:
* platform/win/TestExpectations:
Update expectations for path changes.

* http/wpt/resource-timing/resources/data.json: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/data.json.
* http/wpt/resource-timing/resources/resource.css: Added.
* http/wpt/resource-timing/resources/resource.html: Added.
* http/wpt/resource-timing/resources/resource.js: Added.
* http/wpt/resource-timing/resources/resource.png: Added.
* http/wpt/resource-timing/resources/rt-iframe-1.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-iframe-1.html.
* http/wpt/resource-timing/resources/rt-iframe-2.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-iframe-2.html.
* http/wpt/resource-timing/resources/rt-module.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-module.js.
* http/wpt/resource-timing/resources/rt-revalidation-response.py: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-revalidation-response.py.
* http/wpt/resource-timing/resources/rt-sub-module.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-sub-module.js.
* http/wpt/resource-timing/resources/rt-utilities.sub.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-utilities.sub.js.
* http/wpt/resource-timing/resources/rt-worker-resources.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-worker-resources.js.
* http/wpt/resource-timing/rt-cors-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors-expected.txt.
* http/wpt/resource-timing/rt-cors.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors.html.
* http/wpt/resource-timing/rt-cors.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors.js.
* http/wpt/resource-timing/rt-cors.worker-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors.worker-expected.txt.
* http/wpt/resource-timing/rt-cors.worker.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors.worker.html.
* http/wpt/resource-timing/rt-cors.worker.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors.worker.js.
* http/wpt/resource-timing/rt-initiatorType-css-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-css-expected.txt.
* http/wpt/resource-timing/rt-initiatorType-css.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-css.html.
* http/wpt/resource-timing/rt-initiatorType-element-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-element-expected.txt.
* http/wpt/resource-timing/rt-initiatorType-element.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-element.html.
* http/wpt/resource-timing/rt-initiatorType-fetch-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-fetch-expected.txt.
* http/wpt/resource-timing/rt-initiatorType-fetch.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-fetch.html.
* http/wpt/resource-timing/rt-initiatorType-fetch.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-fetch.js.
* http/wpt/resource-timing/rt-initiatorType-media-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-media-expected.txt.
* http/wpt/resource-timing/rt-initiatorType-media.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-media.html.
* http/wpt/resource-timing/rt-initiatorType-other-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-other-expected.txt.
* http/wpt/resource-timing/rt-initiatorType-other.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-other.html.
* http/wpt/resource-timing/rt-initiatorType-script-module-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-script-module-expected.txt.
* http/wpt/resource-timing/rt-initiatorType-script-module.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-script-module.html.
* http/wpt/resource-timing/rt-initiatorType-xmlhttprequest-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-xmlhttprequest-expected.txt.
* http/wpt/resource-timing/rt-initiatorType-xmlhttprequest.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-xmlhttprequest.html.
* http/wpt/resource-timing/rt-initiatorType-xmlhttprequest.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-xmlhttprequest.js.
* http/wpt/resource-timing/rt-initiatorType.worker-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType.worker-expected.txt.
* http/wpt/resource-timing/rt-initiatorType.worker.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType.worker.html.
* http/wpt/resource-timing/rt-initiatorType.worker.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType.worker.js.
* http/wpt/resource-timing/rt-nextHopProtocol-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol-expected.txt.
* http/wpt/resource-timing/rt-nextHopProtocol.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.html.
* http/wpt/resource-timing/rt-nextHopProtocol.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.js.
* http/wpt/resource-timing/rt-nextHopProtocol.worker-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker-expected.txt.
* http/wpt/resource-timing/rt-nextHopProtocol.worker.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker.html.
* http/wpt/resource-timing/rt-nextHopProtocol.worker.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker.js.
* http/wpt/resource-timing/rt-performance-extensions-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions-expected.txt.
* http/wpt/resource-timing/rt-performance-extensions.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions.html.
* http/wpt/resource-timing/rt-performance-extensions.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions.js.
* http/wpt/resource-timing/rt-performance-extensions.worker-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions.worker-expected.txt.
* http/wpt/resource-timing/rt-performance-extensions.worker.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions.worker.html.
* http/wpt/resource-timing/rt-performance-extensions.worker.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions.worker.js.
* http/wpt/resource-timing/rt-resource-errors-expected.txt: Added.
* http/wpt/resource-timing/rt-resource-errors.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resource-errors.html.
* http/wpt/resource-timing/rt-resource-ignored-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resource-ignored-expected.txt.
* http/wpt/resource-timing/rt-resource-ignored.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resource-ignored.html.
* http/wpt/resource-timing/rt-resources-per-frame-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resources-per-frame-expected.txt.
* http/wpt/resource-timing/rt-resources-per-frame.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resources-per-frame.html.
* http/wpt/resource-timing/rt-resources-per-worker-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resources-per-worker-expected.txt.
* http/wpt/resource-timing/rt-resources-per-worker.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resources-per-worker.html.
* http/wpt/resource-timing/rt-revalidate-requests-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-revalidate-requests-expected.txt.
* http/wpt/resource-timing/rt-revalidate-requests.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-revalidate-requests.html.
* http/wpt/resource-timing/rt-serialization-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-serialization-expected.txt.
* http/wpt/resource-timing/rt-serialization.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-serialization.html.
* http/wpt/resource-timing/rt-shared-resource-in-frames-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-frames-expected.txt.
* http/wpt/resource-timing/rt-shared-resource-in-frames.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-frames.html.
* http/wpt/resource-timing/rt-shared-resource-in-workers-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-workers-expected.txt.
* http/wpt/resource-timing/rt-shared-resource-in-workers.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-workers.html.
Move tests and make small modifications to ensure we load "/WebKit/resource-timing"
test resources instead of "/resource-timing" resources (web-platform-tests ones).

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

73 files changed:
LayoutTests/ChangeLog
LayoutTests/TestExpectations
LayoutTests/http/wpt/resource-timing/resources/data.json [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/data.json with 100% similarity]
LayoutTests/http/wpt/resource-timing/resources/resource.css [new file with mode: 0644]
LayoutTests/http/wpt/resource-timing/resources/resource.html [new file with mode: 0644]
LayoutTests/http/wpt/resource-timing/resources/resource.js [new file with mode: 0644]
LayoutTests/http/wpt/resource-timing/resources/resource.png [new file with mode: 0644]
LayoutTests/http/wpt/resource-timing/resources/rt-iframe-1.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-iframe-1.html with 100% similarity]
LayoutTests/http/wpt/resource-timing/resources/rt-iframe-2.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-iframe-2.html with 100% similarity]
LayoutTests/http/wpt/resource-timing/resources/rt-module.js [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-module.js with 100% similarity]
LayoutTests/http/wpt/resource-timing/resources/rt-revalidation-response.py [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-revalidation-response.py with 100% similarity]
LayoutTests/http/wpt/resource-timing/resources/rt-sub-module.js [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-sub-module.js with 100% similarity]
LayoutTests/http/wpt/resource-timing/resources/rt-utilities.sub.js [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-utilities.sub.js with 93% similarity]
LayoutTests/http/wpt/resource-timing/resources/rt-worker-resources.js [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-worker-resources.js with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-cors-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-cors.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors.html with 86% similarity]
LayoutTests/http/wpt/resource-timing/rt-cors.js [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors.js with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-cors.worker-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors.worker-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-cors.worker.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors.worker.html with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-cors.worker.js [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors.worker.js with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-css-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-css-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-css.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-css.html with 93% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-element-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-element-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-element.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-element.html with 98% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-fetch-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-fetch-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-fetch.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-fetch.html with 87% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-fetch.js [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-fetch.js with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-media-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-media-expected.txt with 51% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-media.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-media.html with 92% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-other-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-other-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-other.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-other.html with 92% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-script-module-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-script-module-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-script-module.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-script-module.html with 81% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-xmlhttprequest-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-xmlhttprequest-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-xmlhttprequest.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-xmlhttprequest.html with 87% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType-xmlhttprequest.js [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-xmlhttprequest.js with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType.worker-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType.worker-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType.worker.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType.worker.html with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-initiatorType.worker.js [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType.worker.js with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-nextHopProtocol-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-nextHopProtocol.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.html with 88% similarity]
LayoutTests/http/wpt/resource-timing/rt-nextHopProtocol.js [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.js with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-nextHopProtocol.worker-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-nextHopProtocol.worker.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker.html with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-nextHopProtocol.worker.js [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker.js with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-performance-extensions-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-performance-extensions.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions.html with 88% similarity]
LayoutTests/http/wpt/resource-timing/rt-performance-extensions.js [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions.js with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-performance-extensions.worker-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions.worker-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-performance-extensions.worker.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions.worker.html with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-performance-extensions.worker.js [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions.worker.js with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-resource-errors-expected.txt [new file with mode: 0644]
LayoutTests/http/wpt/resource-timing/rt-resource-errors.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resource-errors.html with 75% similarity]
LayoutTests/http/wpt/resource-timing/rt-resource-ignored-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resource-ignored-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-resource-ignored.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resource-ignored.html with 92% similarity]
LayoutTests/http/wpt/resource-timing/rt-resources-per-frame-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resources-per-frame-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-resources-per-frame.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resources-per-frame.html with 97% similarity]
LayoutTests/http/wpt/resource-timing/rt-resources-per-worker-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resources-per-worker-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-resources-per-worker.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resources-per-worker.html with 97% similarity]
LayoutTests/http/wpt/resource-timing/rt-revalidate-requests-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-revalidate-requests-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-revalidate-requests.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-revalidate-requests.html with 97% similarity]
LayoutTests/http/wpt/resource-timing/rt-serialization-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-serialization-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-serialization.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-serialization.html with 96% similarity]
LayoutTests/http/wpt/resource-timing/rt-shared-resource-in-frames-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-frames-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-shared-resource-in-frames.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-frames.html with 97% similarity]
LayoutTests/http/wpt/resource-timing/rt-shared-resource-in-workers-expected.txt [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-workers-expected.txt with 100% similarity]
LayoutTests/http/wpt/resource-timing/rt-shared-resource-in-workers.html [moved from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-workers.html with 97% similarity]
LayoutTests/imported/w3c/ChangeLog
LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resource-errors-expected.txt [deleted file]
LayoutTests/platform/gtk/TestExpectations
LayoutTests/platform/mac-wk1/TestExpectations
LayoutTests/platform/mac/TestExpectations
LayoutTests/platform/win/TestExpectations

index 9fc2be5..d76ae6f 100644 (file)
@@ -1,3 +1,85 @@
+2017-09-19  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Move non-upstreamed Resource Timing tests out of web-platform-tests
+        https://bugs.webkit.org/show_bug.cgi?id=177197
+
+        Reviewed by Youenn Fablet.
+
+        * TestExpectations:
+        * platform/gtk/TestExpectations:
+        * platform/mac-wk1/TestExpectations:
+        * platform/mac/TestExpectations:
+        * platform/win/TestExpectations:
+        Update expectations for path changes.
+
+        * http/wpt/resource-timing/resources/data.json: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/data.json.
+        * http/wpt/resource-timing/resources/resource.css: Added.
+        * http/wpt/resource-timing/resources/resource.html: Added.
+        * http/wpt/resource-timing/resources/resource.js: Added.
+        * http/wpt/resource-timing/resources/resource.png: Added.
+        * http/wpt/resource-timing/resources/rt-iframe-1.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-iframe-1.html.
+        * http/wpt/resource-timing/resources/rt-iframe-2.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-iframe-2.html.
+        * http/wpt/resource-timing/resources/rt-module.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-module.js.
+        * http/wpt/resource-timing/resources/rt-revalidation-response.py: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-revalidation-response.py.
+        * http/wpt/resource-timing/resources/rt-sub-module.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-sub-module.js.
+        * http/wpt/resource-timing/resources/rt-utilities.sub.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-utilities.sub.js.
+        * http/wpt/resource-timing/resources/rt-worker-resources.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/resources/rt-worker-resources.js.
+        * http/wpt/resource-timing/rt-cors-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors-expected.txt.
+        * http/wpt/resource-timing/rt-cors.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors.html.
+        * http/wpt/resource-timing/rt-cors.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors.js.
+        * http/wpt/resource-timing/rt-cors.worker-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors.worker-expected.txt.
+        * http/wpt/resource-timing/rt-cors.worker.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors.worker.html.
+        * http/wpt/resource-timing/rt-cors.worker.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-cors.worker.js.
+        * http/wpt/resource-timing/rt-initiatorType-css-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-css-expected.txt.
+        * http/wpt/resource-timing/rt-initiatorType-css.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-css.html.
+        * http/wpt/resource-timing/rt-initiatorType-element-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-element-expected.txt.
+        * http/wpt/resource-timing/rt-initiatorType-element.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-element.html.
+        * http/wpt/resource-timing/rt-initiatorType-fetch-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-fetch-expected.txt.
+        * http/wpt/resource-timing/rt-initiatorType-fetch.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-fetch.html.
+        * http/wpt/resource-timing/rt-initiatorType-fetch.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-fetch.js.
+        * http/wpt/resource-timing/rt-initiatorType-media-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-media-expected.txt.
+        * http/wpt/resource-timing/rt-initiatorType-media.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-media.html.
+        * http/wpt/resource-timing/rt-initiatorType-other-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-other-expected.txt.
+        * http/wpt/resource-timing/rt-initiatorType-other.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-other.html.
+        * http/wpt/resource-timing/rt-initiatorType-script-module-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-script-module-expected.txt.
+        * http/wpt/resource-timing/rt-initiatorType-script-module.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-script-module.html.
+        * http/wpt/resource-timing/rt-initiatorType-xmlhttprequest-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-xmlhttprequest-expected.txt.
+        * http/wpt/resource-timing/rt-initiatorType-xmlhttprequest.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-xmlhttprequest.html.
+        * http/wpt/resource-timing/rt-initiatorType-xmlhttprequest.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-xmlhttprequest.js.
+        * http/wpt/resource-timing/rt-initiatorType.worker-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType.worker-expected.txt.
+        * http/wpt/resource-timing/rt-initiatorType.worker.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType.worker.html.
+        * http/wpt/resource-timing/rt-initiatorType.worker.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-initiatorType.worker.js.
+        * http/wpt/resource-timing/rt-nextHopProtocol-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol-expected.txt.
+        * http/wpt/resource-timing/rt-nextHopProtocol.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.html.
+        * http/wpt/resource-timing/rt-nextHopProtocol.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.js.
+        * http/wpt/resource-timing/rt-nextHopProtocol.worker-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker-expected.txt.
+        * http/wpt/resource-timing/rt-nextHopProtocol.worker.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker.html.
+        * http/wpt/resource-timing/rt-nextHopProtocol.worker.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker.js.
+        * http/wpt/resource-timing/rt-performance-extensions-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions-expected.txt.
+        * http/wpt/resource-timing/rt-performance-extensions.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions.html.
+        * http/wpt/resource-timing/rt-performance-extensions.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions.js.
+        * http/wpt/resource-timing/rt-performance-extensions.worker-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions.worker-expected.txt.
+        * http/wpt/resource-timing/rt-performance-extensions.worker.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions.worker.html.
+        * http/wpt/resource-timing/rt-performance-extensions.worker.js: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-performance-extensions.worker.js.
+        * http/wpt/resource-timing/rt-resource-errors-expected.txt: Added.
+        * http/wpt/resource-timing/rt-resource-errors.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resource-errors.html.
+        * http/wpt/resource-timing/rt-resource-ignored-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resource-ignored-expected.txt.
+        * http/wpt/resource-timing/rt-resource-ignored.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resource-ignored.html.
+        * http/wpt/resource-timing/rt-resources-per-frame-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resources-per-frame-expected.txt.
+        * http/wpt/resource-timing/rt-resources-per-frame.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resources-per-frame.html.
+        * http/wpt/resource-timing/rt-resources-per-worker-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resources-per-worker-expected.txt.
+        * http/wpt/resource-timing/rt-resources-per-worker.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resources-per-worker.html.
+        * http/wpt/resource-timing/rt-revalidate-requests-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-revalidate-requests-expected.txt.
+        * http/wpt/resource-timing/rt-revalidate-requests.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-revalidate-requests.html.
+        * http/wpt/resource-timing/rt-serialization-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-serialization-expected.txt.
+        * http/wpt/resource-timing/rt-serialization.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-serialization.html.
+        * http/wpt/resource-timing/rt-shared-resource-in-frames-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-frames-expected.txt.
+        * http/wpt/resource-timing/rt-shared-resource-in-frames.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-frames.html.
+        * http/wpt/resource-timing/rt-shared-resource-in-workers-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-workers-expected.txt.
+        * http/wpt/resource-timing/rt-shared-resource-in-workers.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-workers.html.
+        Move tests and make small modifications to ensure we load "/WebKit/resource-timing"
+        test resources instead of "/resource-timing" resources (web-platform-tests ones).
+
 2017-09-19  Per Arne Vollan  <pvollan@apple.com>
 
         Skip fast/images/animated-image-mp4.html on Windows.
index 71d74a6..b8b3727 100644 (file)
@@ -399,12 +399,13 @@ imported/w3c/web-platform-tests/fetch/api/cors/cors-redirect-preflight.any.html
 imported/w3c/web-platform-tests/fetch/api/request/request-cache-only-if-cached.html [ DumpJSConsoleLogInStdErr ]
 
 webkit.org/b/161088 imported/w3c/web-platform-tests/resource-timing/resource-timing.html [ Pass Failure ]
-webkit.org/b/168357 imported/w3c/web-platform-tests/resource-timing/rt-initiatorType-media.html [ Failure ]
-webkit.org/b/168448 imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-frames.html [ Pass Failure ]
-webkit.org/b/168448 imported/w3c/web-platform-tests/resource-timing/rt-shared-resource-in-workers.html [ Pass Failure ]
-webkit.org/b/171511 imported/w3c/web-platform-tests/resource-timing/rt-revalidate-requests.html [ Pass Failure ]
 imported/w3c/web-platform-tests/resource-timing/test_resource_timing.html [ Pass Failure ]
 
+webkit.org/b/168357 http/wpt/resource-timing/rt-initiatorType-media.html [ Failure ]
+webkit.org/b/168448 http/wpt/resource-timing/rt-shared-resource-in-frames.html [ Pass Failure ]
+webkit.org/b/168448 http/wpt/resource-timing/rt-shared-resource-in-workers.html [ Pass Failure ]
+webkit.org/b/171511 http/wpt/resource-timing/rt-revalidate-requests.html [ Pass Failure ]
+
 webkit.org/b/161312 imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/document-without-browsing-context.html [ Failure Pass ]
 
 imported/w3c/web-platform-tests/XMLHttpRequest/send-conditional-cors.htm [ Failure ]
diff --git a/LayoutTests/http/wpt/resource-timing/resources/resource.css b/LayoutTests/http/wpt/resource-timing/resources/resource.css
new file mode 100644 (file)
index 0000000..e68d4f8
--- /dev/null
@@ -0,0 +1,4 @@
+div#resource_link_css
+{
+    color:hotpink;
+}
diff --git a/LayoutTests/http/wpt/resource-timing/resources/resource.html b/LayoutTests/http/wpt/resource-timing/resources/resource.html
new file mode 100644 (file)
index 0000000..31432ad
--- /dev/null
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>
+        Child Frame
+        </title>
+    </head>
+    <body style="background-color: #C0C0C0">
+
+        <h1>
+        Child Document
+        </h1>
+
+    </body>
+</html>
diff --git a/LayoutTests/http/wpt/resource-timing/resources/resource.js b/LayoutTests/http/wpt/resource-timing/resources/resource.js
new file mode 100644 (file)
index 0000000..cf1c1df
--- /dev/null
@@ -0,0 +1,3 @@
+// This is a test script for purposes of testing the
+// script initiator type in the Resource Timing feature
+var testDummyValue = 0;
diff --git a/LayoutTests/http/wpt/resource-timing/resources/resource.png b/LayoutTests/http/wpt/resource-timing/resources/resource.png
new file mode 100644 (file)
index 0000000..be211bc
Binary files /dev/null and b/LayoutTests/http/wpt/resource-timing/resources/resource.png differ
@@ -20,12 +20,12 @@ function wait() {
         continue;
 }
 
-function uniqueDataURL(key, crossOrigin) { return uniqueURL(key, crossOrigin, "resource-timing/resources/data.json"); }
-function uniqueImageURL(key, crossOrigin) { return uniqueURL(key, crossOrigin, "resource-timing/resources/resource_timing_test0.png"); }
-function uniqueScriptURL(key, crossOrigin) { return uniqueURL(key, crossOrigin, "resource-timing/resources/resource_timing_test0.js"); }
-function uniqueStylesheetURL(key, crossOrigin) { return uniqueURL(key, crossOrigin, "resource-timing/resources/resource_timing_test0.css"); }
-function uniqueDocumentURL(key, crossOrigin) { return uniqueURL(key, crossOrigin, "resource-timing/resources/resource_timing_test0.html"); }
-function uniqueEventSourceURL(key, crossOrigin) { return uniqueURL(key, crossOrigin, "resource-timing/resources/rt-event-stream.py"); }
+function uniqueDataURL(key, crossOrigin) { return uniqueURL(key, crossOrigin, "WebKit/resource-timing/resources/data.json"); }
+function uniqueImageURL(key, crossOrigin) { return uniqueURL(key, crossOrigin, "WebKit/resource-timing/resources/resource.png"); }
+function uniqueScriptURL(key, crossOrigin) { return uniqueURL(key, crossOrigin, "WebKit/resource-timing/resources/resource.js"); }
+function uniqueStylesheetURL(key, crossOrigin) { return uniqueURL(key, crossOrigin, "WebKit/resource-timing/resources/resource.css"); }
+function uniqueDocumentURL(key, crossOrigin) { return uniqueURL(key, crossOrigin, "WebKit/resource-timing/resources/resource.html"); }
+function uniqueEventSourceURL(key, crossOrigin) { return uniqueURL(key, crossOrigin, "WebKit/resource-timing/resources/rt-event-stream.py"); }
 function uniqueURL(key, crossOrigin, path) {
     let params = key ? `${key}&${Math.random()}` : `${Math.random()}`;
     if (crossOrigin === "cross-origin")
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - CORS requests</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <link rel="help" href="https://w3c.github.io/resource-timing/#cross-origin-resources">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - CSS initiatorType</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <link rel="help" href="https://w3c.github.io/resource-timing/#dom-performanceresourcetiming-initiatortype">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - Element localName initiatorType</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <link rel="help" href="https://w3c.github.io/resource-timing/#dom-performanceresourcetiming-initiatortype">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - Fetch initiatorType</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <link rel="help" href="https://w3c.github.io/resource-timing/#dom-performanceresourcetiming-initiatortype">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -3,6 +3,6 @@ Resource Timing: Element localName initiatorType
 
 PASS Type: video - <video src> 
 PASS Timing: video - <video src> 
-FAIL Type: audio - <audio src> assert_equals: name should be the url expected "http://localhost:8800/resource-timing/resources/data.json?audio&0.033975899379337426" but got "http://localhost:8800/resource-timing/resources/data.json?video&0.019321360269903165"
+FAIL Type: audio - <audio src> assert_equals: name should be the url expected "http://localhost:8800/WebKit/resource-timing/resources/data.json?audio&0.5660213883579809" but got "http://localhost:8800/WebKit/resource-timing/resources/data.json?video&0.7924746989228406"
 PASS Timing: audio - <audio src> 
 
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - Element localName initiatorType</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <link rel="help" href="https://w3c.github.io/resource-timing/#dom-performanceresourcetiming-initiatortype">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - Other initiatorType</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <link rel="help" href="https://w3c.github.io/resource-timing/#dom-performanceresourcetiming-initiatortype">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - Other initiatorType</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <link rel="help" href="https://w3c.github.io/resource-timing/#dom-performanceresourcetiming-initiatortype">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 promise_test(function(t) {
     return observeResources(2).then(([moduleEntry, subModuleEntry]) => {
         checkResourceTimingEntryType(moduleEntry, {
-            name: location.origin + "/resource-timing/resources/rt-module.js",
+            name: location.origin + "/WebKit/resource-timing/resources/rt-module.js",
             initiatorType: "script",
         });
         checkResourceTimingEntryType(subModuleEntry, {
-            name: location.origin + "/resource-timing/resources/rt-sub-module.js",
+            name: location.origin + "/WebKit/resource-timing/resources/rt-sub-module.js",
             initiatorType: "script",
         });
         checkResourceTimingEntryTiming(moduleEntry);
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - XMLHttpRequest initiatorType</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <link rel="help" href="https://w3c.github.io/resource-timing/#dom-performanceresourcetiming-initiatortype">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - nextHopProtocol</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <meta name="assert" content="Resource Timing nextHopProtocol">
 <link rel="help" href="https://w3c.github.io/resource-timing/#dom-performanceresourcetiming-nexthopprotocol">
 <script src="/resources/testharness.js"></script>
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - Performance Extensions</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <meta name="assert" content="Resource Timing Performance Extensions">
 <link rel="help" href="https://w3c.github.io/resource-timing/#extensions-performance-interface">
 <script src="/resources/testharness.js"></script>
diff --git a/LayoutTests/http/wpt/resource-timing/rt-resource-errors-expected.txt b/LayoutTests/http/wpt/resource-timing/rt-resource-errors-expected.txt
new file mode 100644 (file)
index 0000000..a0aff72
--- /dev/null
@@ -0,0 +1,9 @@
+CONSOLE MESSAGE: Refused to load http://localhost:8801/WebKit/resource-timing/resources/resource.png?csp-denied because it does not appear in the img-src directive of the Content Security Policy.
+CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/WebKit/resource-timing/resources/data.json?cors-denied. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+Resource Timing: Error cases
+
+
+PASS Content-Security-Policy rejections do not create entries 
+PASS CORS preflight failures do not create entries 
+
@@ -4,7 +4,6 @@
 <meta charset="utf-8">
 <title>Resource Timing - Error cases</title>
 <meta http-equiv="Content-Security-Policy" content="img-src 'self'">
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <link rel="help" href="https://w3c.github.io/resource-timing/#resources-included">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -15,7 +14,7 @@
 <div id="log"></div>
 <script>
 promise_test(function(t) {
-    let rejectedImageURL = crossOriginURL("csp-denied", "resource-timing/resources/resource_timing_test0.png");
+    let rejectedImageURL = crossOriginURL("csp-denied", "WebKit/resource-timing/resources/resource.png");
     let allowedImageURL = uniqueImageURL("csp-allowed");
 
     let rejectedImg = document.body.appendChild(document.createElement("img"));
@@ -30,8 +29,8 @@ promise_test(function(t) {
 }, "Content-Security-Policy rejections do not create entries");
 
 promise_test(function(t) {
-    let rejectedDataURL = crossOriginURL("cors-denied", "resource-timing/resources/data.json");
-    let allowedDataURL = crossOriginURL("cors-allowed", "resource-timing/resources/data.json") + "&pipe=header(Access-Control-Allow-Origin,*)";
+    let rejectedDataURL = crossOriginURL("cors-denied", "WebKit/resource-timing/resources/data.json");
+    let allowedDataURL = crossOriginURL("cors-allowed", "WebKit/resource-timing/resources/data.json") + "&pipe=header(Access-Control-Allow-Origin,*)";
 
     fetch(rejectedDataURL).catch(function(){});
     fetch(allowedDataURL);
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - Ignored resources</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <link rel="help" href="https://w3c.github.io/resource-timing/#resources-included">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - Entries per Frame</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <link rel="help" href="https://w3c.github.io/resource-timing/#processing-model">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - Entries per Worker</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <link rel="help" href="https://w3c.github.io/resource-timing/#processing-model">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - ResourceTiming for revalidation requests</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/rt-utilities.sub.js"></script>
@@ -20,7 +19,7 @@ function createRevalidationURL({tao, crossOrigin}) {
     let date = encodeURIComponent(new Date(2000, 1, 1).toGMTString());
     let params = `content=${content}&mimeType=${mimeType}&date=${date}&tao=${tao ? true : false}`;
 
-    const path = "resource-timing/resources/rt-revalidation-response.py";
+    const path = "WebKit/resource-timing/resources/rt-revalidation-response.py";
     if (crossOrigin)
         return crossOriginURL(`${token}&${params}`, path);
     return location.origin + `/${path}?${token}&${params}`;
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - Serialization</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <link rel="help" href="http://yoavweiss.github.io/resource-timing/#performanceresourcetiming">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - Shared Entry has Distinct Entry per Frame</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <link rel="help" href="https://w3c.github.io/resource-timing/#processing-model">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>Resource Timing - Entries per Worker</title>
-<meta name="author" title="JosephPecoraro" href="mailto:joepeck@webkit.org">
 <link rel="help" href="https://w3c.github.io/resource-timing/#processing-model">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
index 0ef3aaf..c58ad1e 100644 (file)
@@ -1,3 +1,13 @@
+2017-09-19  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Move non-upstreamed Resource Timing tests out of web-platform-tests
+        https://bugs.webkit.org/show_bug.cgi?id=177197
+
+        Reviewed by Youenn Fablet.
+
+        * web-platform-tests/resource-timing/rt-*:
+        These are not upstream, move them out to http/wpt.
+
 2017-09-19  Nael Ouedraogo  <nael.ouedraogo@crf.canon.fr>
 
         [GTK] The binding code of Media Source Extension of AudioTrack, VideoTrack and TextTrack is not generated
diff --git a/LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resource-errors-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/resource-timing/rt-resource-errors-expected.txt
deleted file mode 100644 (file)
index 1c6143a..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-CONSOLE MESSAGE: Refused to load http://localhost:8801/resource-timing/resources/resource_timing_test0.png?csp-denied because it does not appear in the img-src directive of the Content Security Policy.
-CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/resource-timing/resources/data.json?cors-denied. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-Resource Timing: Error cases
-
-
-PASS Content-Security-Policy rejections do not create entries 
-PASS CORS preflight failures do not create entries 
-
index 3bd6263..5075548 100644 (file)
@@ -3238,8 +3238,8 @@ webkit.org/b/167999 imported/w3c/web-platform-tests/fetch/api/redirect/redirect-
 webkit.org/b/167999 imported/w3c/web-platform-tests/fetch/api/redirect/redirect-location.html [ Failure ]
 webkit.org/b/167999 imported/w3c/web-platform-tests/fetch/api/redirect/redirect-location-worker.html [ Failure ]
 
-webkit.org/b/168543 imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.html [ Failure ]
-webkit.org/b/168543 imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker.html [ Failure ]
+webkit.org/b/168543 http/wpt/resource-timing/rt-nextHopProtocol.html [ Failure ]
+webkit.org/b/168543 http/wpt/resource-timing/rt-nextHopProtocol.worker.html [ Failure ]
 
 webkit.org/b/145260 media/audio-playback-restriction-play.html [ Failure ]
 
index 3e4cf42..9182e27 100644 (file)
@@ -320,8 +320,8 @@ webkit.org/b/163361 imported/w3c/web-platform-tests/html/webappapis/animation-fr
 webkit.org/b/163361 imported/w3c/web-platform-tests/html/webappapis/animation-frames/callback-multicalls.html [ Pass Failure ]
 
 # Resource Metrics data not available in WebKit1.
-imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.html [ Failure ]
-imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker.html [ Failure ]
+http/wpt/resource-timing/rt-nextHopProtocol.html [ Failure ]
+http/wpt/resource-timing/rt-nextHopProtocol.worker.html [ Failure ]
 http/tests/inspector/network/resource-request-headers.html [ Failure ]
 http/tests/inspector/network/resource-sizes-network.html [ Failure ]
 http/tests/inspector/network/resource-sizes-memory-cache.html [ Failure ]
index 01ad132..e752dea 100644 (file)
@@ -1439,12 +1439,13 @@ webkit.org/b/168087 media/video-zoom.html [ Pass Failure ]
 webkit.org/b/168094 imported/w3c/web-platform-tests/media-source/SourceBuffer-abort.html [ Pass Failure ]
 webkit.org/b/167975 imported/w3c/web-platform-tests/media-source/SourceBuffer-abort-removed.html [ Pass Failure ]
 
-webkit.org/b/168415 [ ElCapitan ] imported/w3c/web-platform-tests/resource-timing/rt-cors.html [ Skip ]
-webkit.org/b/168415 [ ElCapitan ] imported/w3c/web-platform-tests/resource-timing/rt-cors.worker.html [ Skip ]
+# Resource Timing data not available in El Capitan.
+webkit.org/b/168415 [ ElCapitan ] http/wpt/resource-timing/rt-cors.html [ Skip ]
+webkit.org/b/168415 [ ElCapitan ] http/wpt/resource-timing/rt-cors.worker.html [ Skip ]
 
 # Resource Timing networking data not available without Network Session.
-[ ElCapitan ] imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.html [ Failure ]
-[ ElCapitan ] imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker.html [ Failure ]
+[ ElCapitan ] http/wpt/resource-timing/rt-nextHopProtocol.html [ Failure ]
+[ ElCapitan ] http/wpt/resource-timing/rt-nextHopProtocol.worker.html [ Failure ]
 
 # Request Header networking data not available without Network Session.
 [ ElCapitan ] http/tests/inspector/network/resource-request-headers.html [ Failure ]
index fbcd3cf..926ae5b 100644 (file)
@@ -3885,8 +3885,8 @@ http/tests/webrtc/filtering-ice-candidate-same-origin-frame.html [ Skip ]
 http/tests/webrtc/filtering-ice-candidate-same-origin-frame2.html [ Skip ]
 
 # Resource Timing Metrics not available.
-imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.html [ Skip ]
-imported/w3c/web-platform-tests/resource-timing/rt-nextHopProtocol.worker.html [ Skip ]
+http/wpt/resource-timing/rt-nextHopProtocol.html [ Skip ]
+http/wpt/resource-timing/rt-nextHopProtocol.worker.html [ Skip ]
 
 # WebCrypto tests are failing.
 webkit.org/b/165090 imported/w3c/web-platform-tests/WebCryptoAPI [ Skip ]