2009-09-19 Shinichiro Hamaji <hamaji@chromium.org>
Rubber-stamped by Eric Seidel.
js tests should move into jstests subdirectory instead of resources/
https://bugs.webkit.org/show_bug.cgi?id=25880
Migration for http, platform, plugins, traversal, and wml directories.
* http/tests/cookies/double-quoted-value-with-semi-colon.html:
* http/tests/cookies/multiple-cookies.html:
* http/tests/cookies/resources/TEMPLATE.html: Removed.
* http/tests/cookies/resources/double-quoted-value-with-semi-colon.js: Removed.
* http/tests/cookies/resources/multiple-cookies.js: Removed.
* http/tests/cookies/resources/simple-cookies-expired.js: Removed.
* http/tests/cookies/resources/simple-cookies-max-age.js: Removed.
* http/tests/cookies/script-tests: Added.
* http/tests/cookies/script-tests/TEMPLATE.html: Copied from LayoutTests/http/tests/cookies/resources/TEMPLATE.html.
* http/tests/cookies/script-tests/double-quoted-value-with-semi-colon.js: Copied from LayoutTests/http/tests/cookies/resources/double-quoted-value-with-semi-colon.js.
* http/tests/cookies/script-tests/multiple-cookies.js: Copied from LayoutTests/http/tests/cookies/resources/multiple-cookies.js.
* http/tests/cookies/script-tests/simple-cookies-expired.js: Copied from LayoutTests/http/tests/cookies/resources/simple-cookies-expired.js.
* http/tests/cookies/script-tests/simple-cookies-max-age.js: Copied from LayoutTests/http/tests/cookies/resources/simple-cookies-max-age.js.
* http/tests/cookies/simple-cookies-expired.html:
* http/tests/cookies/simple-cookies-max-age.html:
* http/tests/security/clipboard/clipboard-file-access.html:
* http/tests/security/clipboard/resources/TEMPLATE.html: Removed.
* http/tests/security/clipboard/resources/clipboard-file-access.js: Removed.
* http/tests/security/clipboard/script-tests: Added.
* http/tests/security/clipboard/script-tests/TEMPLATE.html: Copied from LayoutTests/http/tests/security/clipboard/resources/TEMPLATE.html.
* http/tests/security/clipboard/script-tests/clipboard-file-access.js: Copied from LayoutTests/http/tests/security/clipboard/resources/clipboard-file-access.js.
* http/tests/wml/access-target-domain-deny.html:
* http/tests/wml/access-target-path-deny.html:
* http/tests/wml/access-target.html:
* http/tests/wml/go-task-get-method-accept-charset.html:
* http/tests/wml/go-task-get-method.html:
* http/tests/wml/go-task-post-method-accept-charset.html:
* http/tests/wml/go-task-post-method.html:
* http/tests/wml/post-data-to-server.html:
* http/tests/wml/resources/TEMPLATE.html: Removed.
* http/tests/wml/resources/access-target-domain-deny.js: Removed.
* http/tests/wml/resources/access-target-path-deny.js: Removed.
* http/tests/wml/resources/access-target.js: Removed.
* http/tests/wml/resources/go-task-get-method-accept-charset.js: Removed.
* http/tests/wml/resources/go-task-get-method.js: Removed.
* http/tests/wml/resources/go-task-post-method-accept-charset.js: Removed.
* http/tests/wml/resources/go-task-post-method.js: Removed.
* http/tests/wml/resources/post-data-to-server.js: Removed.
* http/tests/wml/script-tests: Added.
* http/tests/wml/script-tests/TEMPLATE.html: Copied from LayoutTests/http/tests/wml/resources/TEMPLATE.html.
* http/tests/wml/script-tests/access-target-domain-deny.js: Copied from LayoutTests/http/tests/wml/resources/access-target-domain-deny.js.
* http/tests/wml/script-tests/access-target-path-deny.js: Copied from LayoutTests/http/tests/wml/resources/access-target-path-deny.js.
* http/tests/wml/script-tests/access-target.js: Copied from LayoutTests/http/tests/wml/resources/access-target.js.
* http/tests/wml/script-tests/go-task-get-method-accept-charset.js: Copied from LayoutTests/http/tests/wml/resources/go-task-get-method-accept-charset.js.
* http/tests/wml/script-tests/go-task-get-method.js: Copied from LayoutTests/http/tests/wml/resources/go-task-get-method.js.
* http/tests/wml/script-tests/go-task-post-method-accept-charset.js: Copied from LayoutTests/http/tests/wml/resources/go-task-post-method-accept-charset.js.
* http/tests/wml/script-tests/go-task-post-method.js: Copied from LayoutTests/http/tests/wml/resources/go-task-post-method.js.
* http/tests/wml/script-tests/post-data-to-server.js: Copied from LayoutTests/http/tests/wml/resources/post-data-to-server.js.
* platform/gtk/editing/pasteboard/resources/TEMPLATE.html: Removed.
* platform/gtk/editing/pasteboard/resources/middle-click-onpaste.js: Removed.
* platform/gtk/editing/pasteboard/script-tests: Added.
* platform/gtk/editing/pasteboard/script-tests/TEMPLATE.html: Copied from LayoutTests/platform/gtk/editing/pasteboard/resources/TEMPLATE.html.
* platform/gtk/editing/pasteboard/script-tests/middle-click-onpaste.js: Copied from LayoutTests/platform/gtk/editing/pasteboard/resources/middle-click-onpaste.js.
* platform/win/fast/events/context-click-events.html:
* platform/win/fast/events/resources/TEMPLATE.html: Removed.
* platform/win/fast/events/resources/context-click-events.js: Removed.
* platform/win/fast/events/script-tests: Added.
* platform/win/fast/events/script-tests/TEMPLATE.html: Copied from LayoutTests/platform/win/fast/events/resources/TEMPLATE.html.
* platform/win/fast/events/script-tests/context-click-events.js: Copied from LayoutTests/platform/win/fast/events/resources/context-click-events.js.
* plugins/netscape-identifier-conversion.html:
* plugins/resources/TEMPLATE.html: Removed.
* plugins/resources/netscape-identifier-conversion.js: Removed.
* plugins/script-tests: Added.
* plugins/script-tests/TEMPLATE.html: Copied from LayoutTests/plugins/resources/TEMPLATE.html.
* plugins/script-tests/netscape-identifier-conversion.js: Copied from LayoutTests/plugins/resources/netscape-identifier-conversion.js.
* traversal/acid3-test-2.html:
* traversal/exception-forwarding.html:
* traversal/resources/TEMPLATE.html: Removed.
* traversal/resources/acid3-test-2.js: Removed.
* traversal/resources/exception-forwarding.js: Removed.
* traversal/script-tests: Added.
* traversal/script-tests/TEMPLATE.html: Copied from LayoutTests/traversal/resources/TEMPLATE.html.
* traversal/script-tests/acid3-test-2.js: Copied from LayoutTests/traversal/resources/acid3-test-2.js.
* traversal/script-tests/exception-forwarding.js: Copied from LayoutTests/traversal/resources/exception-forwarding.js.
* wml/access-target-deny.html:
* wml/access-target.html:
* wml/enter-card-with-events.html:
* wml/enter-first-card-with-events.html:
* wml/go-task-get-method-external-deck-with-href.html:
* wml/go-task-get-method-external-deck.html:
* wml/go-task-get-method-same-deck.html:
* wml/input-format.html:
* wml/newcontext-same-deck.html:
* wml/onenterforward-event.html:
* wml/onenterforward-inline-event.html:
* wml/ontimer-event.html:
* wml/ontimer-inline-event.html:
* wml/option-element-onpick-recursion.html:
* wml/option-element-onpick.html:
* wml/resources/TEMPLATE.html: Removed.
* wml/resources/access-target-deny.js: Removed.
* wml/resources/access-target.js: Removed.
* wml/resources/enter-card-with-events.js: Removed.
* wml/resources/enter-first-card-with-events.js: Removed.
* wml/resources/go-task-get-method-external-deck-with-href.js: Removed.
* wml/resources/go-task-get-method-external-deck.js: Removed.
* wml/resources/go-task-get-method-same-deck.js: Removed.
* wml/resources/input-format.js: Removed.
* wml/resources/newcontext-same-deck.js: Removed.
* wml/resources/onenterforward-event.js: Removed.
* wml/resources/onenterforward-inline-event.js: Removed.
* wml/resources/ontimer-event.js: Removed.
* wml/resources/ontimer-inline-event.js: Removed.
* wml/resources/option-element-onpick-recursion.js: Removed.
* wml/resources/option-element-onpick.js: Removed.
* wml/resources/select-element-variables.js: Removed.
* wml/resources/variable-reference-invalid-character.js: Removed.
* wml/resources/variable-reference-valid.js: Removed.
* wml/script-tests: Added.
* wml/script-tests/TEMPLATE.html: Copied from LayoutTests/wml/resources/TEMPLATE.html.
* wml/script-tests/access-target-deny.js: Copied from LayoutTests/wml/resources/access-target-deny.js.
* wml/script-tests/access-target.js: Copied from LayoutTests/wml/resources/access-target.js.
* wml/script-tests/enter-card-with-events.js: Copied from LayoutTests/wml/resources/enter-card-with-events.js.
* wml/script-tests/enter-first-card-with-events.js: Copied from LayoutTests/wml/resources/enter-first-card-with-events.js.
* wml/script-tests/go-task-get-method-external-deck-with-href.js: Copied from LayoutTests/wml/resources/go-task-get-method-external-deck-with-href.js.
* wml/script-tests/go-task-get-method-external-deck.js: Copied from LayoutTests/wml/resources/go-task-get-method-external-deck.js.
* wml/script-tests/go-task-get-method-same-deck.js: Copied from LayoutTests/wml/resources/go-task-get-method-same-deck.js.
* wml/script-tests/input-format.js: Copied from LayoutTests/wml/resources/input-format.js.
* wml/script-tests/newcontext-same-deck.js: Copied from LayoutTests/wml/resources/newcontext-same-deck.js.
* wml/script-tests/onenterforward-event.js: Copied from LayoutTests/wml/resources/onenterforward-event.js.
* wml/script-tests/onenterforward-inline-event.js: Copied from LayoutTests/wml/resources/onenterforward-inline-event.js.
* wml/script-tests/ontimer-event.js: Copied from LayoutTests/wml/resources/ontimer-event.js.
* wml/script-tests/ontimer-inline-event.js: Copied from LayoutTests/wml/resources/ontimer-inline-event.js.
* wml/script-tests/option-element-onpick-recursion.js: Copied from LayoutTests/wml/resources/option-element-onpick-recursion.js.
* wml/script-tests/option-element-onpick.js: Copied from LayoutTests/wml/resources/option-element-onpick.js.
* wml/script-tests/select-element-variables.js: Copied from LayoutTests/wml/resources/select-element-variables.js.
* wml/script-tests/variable-reference-invalid-character.js: Copied from LayoutTests/wml/resources/variable-reference-invalid-character.js.
* wml/script-tests/variable-reference-valid.js: Copied from LayoutTests/wml/resources/variable-reference-valid.js.
* wml/select-element-variables.html:
* wml/variable-reference-invalid-character.html:
* wml/variable-reference-valid.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48553 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f466ba0..f93ff06 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -5,6 +5,147 @@
js tests should move into jstests subdirectory instead of resources/
https://bugs.webkit.org/show_bug.cgi?id=25880
+ Migration for http, platform, plugins, traversal, and wml directories.
+
+ * http/tests/cookies/double-quoted-value-with-semi-colon.html:
+ * http/tests/cookies/multiple-cookies.html:
+ * http/tests/cookies/resources/TEMPLATE.html: Removed.
+ * http/tests/cookies/resources/double-quoted-value-with-semi-colon.js: Removed.
+ * http/tests/cookies/resources/multiple-cookies.js: Removed.
+ * http/tests/cookies/resources/simple-cookies-expired.js: Removed.
+ * http/tests/cookies/resources/simple-cookies-max-age.js: Removed.
+ * http/tests/cookies/script-tests: Added.
+ * http/tests/cookies/script-tests/TEMPLATE.html: Copied from LayoutTests/http/tests/cookies/resources/TEMPLATE.html.
+ * http/tests/cookies/script-tests/double-quoted-value-with-semi-colon.js: Copied from LayoutTests/http/tests/cookies/resources/double-quoted-value-with-semi-colon.js.
+ * http/tests/cookies/script-tests/multiple-cookies.js: Copied from LayoutTests/http/tests/cookies/resources/multiple-cookies.js.
+ * http/tests/cookies/script-tests/simple-cookies-expired.js: Copied from LayoutTests/http/tests/cookies/resources/simple-cookies-expired.js.
+ * http/tests/cookies/script-tests/simple-cookies-max-age.js: Copied from LayoutTests/http/tests/cookies/resources/simple-cookies-max-age.js.
+ * http/tests/cookies/simple-cookies-expired.html:
+ * http/tests/cookies/simple-cookies-max-age.html:
+ * http/tests/security/clipboard/clipboard-file-access.html:
+ * http/tests/security/clipboard/resources/TEMPLATE.html: Removed.
+ * http/tests/security/clipboard/resources/clipboard-file-access.js: Removed.
+ * http/tests/security/clipboard/script-tests: Added.
+ * http/tests/security/clipboard/script-tests/TEMPLATE.html: Copied from LayoutTests/http/tests/security/clipboard/resources/TEMPLATE.html.
+ * http/tests/security/clipboard/script-tests/clipboard-file-access.js: Copied from LayoutTests/http/tests/security/clipboard/resources/clipboard-file-access.js.
+ * http/tests/wml/access-target-domain-deny.html:
+ * http/tests/wml/access-target-path-deny.html:
+ * http/tests/wml/access-target.html:
+ * http/tests/wml/go-task-get-method-accept-charset.html:
+ * http/tests/wml/go-task-get-method.html:
+ * http/tests/wml/go-task-post-method-accept-charset.html:
+ * http/tests/wml/go-task-post-method.html:
+ * http/tests/wml/post-data-to-server.html:
+ * http/tests/wml/resources/TEMPLATE.html: Removed.
+ * http/tests/wml/resources/access-target-domain-deny.js: Removed.
+ * http/tests/wml/resources/access-target-path-deny.js: Removed.
+ * http/tests/wml/resources/access-target.js: Removed.
+ * http/tests/wml/resources/go-task-get-method-accept-charset.js: Removed.
+ * http/tests/wml/resources/go-task-get-method.js: Removed.
+ * http/tests/wml/resources/go-task-post-method-accept-charset.js: Removed.
+ * http/tests/wml/resources/go-task-post-method.js: Removed.
+ * http/tests/wml/resources/post-data-to-server.js: Removed.
+ * http/tests/wml/script-tests: Added.
+ * http/tests/wml/script-tests/TEMPLATE.html: Copied from LayoutTests/http/tests/wml/resources/TEMPLATE.html.
+ * http/tests/wml/script-tests/access-target-domain-deny.js: Copied from LayoutTests/http/tests/wml/resources/access-target-domain-deny.js.
+ * http/tests/wml/script-tests/access-target-path-deny.js: Copied from LayoutTests/http/tests/wml/resources/access-target-path-deny.js.
+ * http/tests/wml/script-tests/access-target.js: Copied from LayoutTests/http/tests/wml/resources/access-target.js.
+ * http/tests/wml/script-tests/go-task-get-method-accept-charset.js: Copied from LayoutTests/http/tests/wml/resources/go-task-get-method-accept-charset.js.
+ * http/tests/wml/script-tests/go-task-get-method.js: Copied from LayoutTests/http/tests/wml/resources/go-task-get-method.js.
+ * http/tests/wml/script-tests/go-task-post-method-accept-charset.js: Copied from LayoutTests/http/tests/wml/resources/go-task-post-method-accept-charset.js.
+ * http/tests/wml/script-tests/go-task-post-method.js: Copied from LayoutTests/http/tests/wml/resources/go-task-post-method.js.
+ * http/tests/wml/script-tests/post-data-to-server.js: Copied from LayoutTests/http/tests/wml/resources/post-data-to-server.js.
+ * platform/gtk/editing/pasteboard/resources/TEMPLATE.html: Removed.
+ * platform/gtk/editing/pasteboard/resources/middle-click-onpaste.js: Removed.
+ * platform/gtk/editing/pasteboard/script-tests: Added.
+ * platform/gtk/editing/pasteboard/script-tests/TEMPLATE.html: Copied from LayoutTests/platform/gtk/editing/pasteboard/resources/TEMPLATE.html.
+ * platform/gtk/editing/pasteboard/script-tests/middle-click-onpaste.js: Copied from LayoutTests/platform/gtk/editing/pasteboard/resources/middle-click-onpaste.js.
+ * platform/win/fast/events/context-click-events.html:
+ * platform/win/fast/events/resources/TEMPLATE.html: Removed.
+ * platform/win/fast/events/resources/context-click-events.js: Removed.
+ * platform/win/fast/events/script-tests: Added.
+ * platform/win/fast/events/script-tests/TEMPLATE.html: Copied from LayoutTests/platform/win/fast/events/resources/TEMPLATE.html.
+ * platform/win/fast/events/script-tests/context-click-events.js: Copied from LayoutTests/platform/win/fast/events/resources/context-click-events.js.
+ * plugins/netscape-identifier-conversion.html:
+ * plugins/resources/TEMPLATE.html: Removed.
+ * plugins/resources/netscape-identifier-conversion.js: Removed.
+ * plugins/script-tests: Added.
+ * plugins/script-tests/TEMPLATE.html: Copied from LayoutTests/plugins/resources/TEMPLATE.html.
+ * plugins/script-tests/netscape-identifier-conversion.js: Copied from LayoutTests/plugins/resources/netscape-identifier-conversion.js.
+ * traversal/acid3-test-2.html:
+ * traversal/exception-forwarding.html:
+ * traversal/resources/TEMPLATE.html: Removed.
+ * traversal/resources/acid3-test-2.js: Removed.
+ * traversal/resources/exception-forwarding.js: Removed.
+ * traversal/script-tests: Added.
+ * traversal/script-tests/TEMPLATE.html: Copied from LayoutTests/traversal/resources/TEMPLATE.html.
+ * traversal/script-tests/acid3-test-2.js: Copied from LayoutTests/traversal/resources/acid3-test-2.js.
+ * traversal/script-tests/exception-forwarding.js: Copied from LayoutTests/traversal/resources/exception-forwarding.js.
+ * wml/access-target-deny.html:
+ * wml/access-target.html:
+ * wml/enter-card-with-events.html:
+ * wml/enter-first-card-with-events.html:
+ * wml/go-task-get-method-external-deck-with-href.html:
+ * wml/go-task-get-method-external-deck.html:
+ * wml/go-task-get-method-same-deck.html:
+ * wml/input-format.html:
+ * wml/newcontext-same-deck.html:
+ * wml/onenterforward-event.html:
+ * wml/onenterforward-inline-event.html:
+ * wml/ontimer-event.html:
+ * wml/ontimer-inline-event.html:
+ * wml/option-element-onpick-recursion.html:
+ * wml/option-element-onpick.html:
+ * wml/resources/TEMPLATE.html: Removed.
+ * wml/resources/access-target-deny.js: Removed.
+ * wml/resources/access-target.js: Removed.
+ * wml/resources/enter-card-with-events.js: Removed.
+ * wml/resources/enter-first-card-with-events.js: Removed.
+ * wml/resources/go-task-get-method-external-deck-with-href.js: Removed.
+ * wml/resources/go-task-get-method-external-deck.js: Removed.
+ * wml/resources/go-task-get-method-same-deck.js: Removed.
+ * wml/resources/input-format.js: Removed.
+ * wml/resources/newcontext-same-deck.js: Removed.
+ * wml/resources/onenterforward-event.js: Removed.
+ * wml/resources/onenterforward-inline-event.js: Removed.
+ * wml/resources/ontimer-event.js: Removed.
+ * wml/resources/ontimer-inline-event.js: Removed.
+ * wml/resources/option-element-onpick-recursion.js: Removed.
+ * wml/resources/option-element-onpick.js: Removed.
+ * wml/resources/select-element-variables.js: Removed.
+ * wml/resources/variable-reference-invalid-character.js: Removed.
+ * wml/resources/variable-reference-valid.js: Removed.
+ * wml/script-tests: Added.
+ * wml/script-tests/TEMPLATE.html: Copied from LayoutTests/wml/resources/TEMPLATE.html.
+ * wml/script-tests/access-target-deny.js: Copied from LayoutTests/wml/resources/access-target-deny.js.
+ * wml/script-tests/access-target.js: Copied from LayoutTests/wml/resources/access-target.js.
+ * wml/script-tests/enter-card-with-events.js: Copied from LayoutTests/wml/resources/enter-card-with-events.js.
+ * wml/script-tests/enter-first-card-with-events.js: Copied from LayoutTests/wml/resources/enter-first-card-with-events.js.
+ * wml/script-tests/go-task-get-method-external-deck-with-href.js: Copied from LayoutTests/wml/resources/go-task-get-method-external-deck-with-href.js.
+ * wml/script-tests/go-task-get-method-external-deck.js: Copied from LayoutTests/wml/resources/go-task-get-method-external-deck.js.
+ * wml/script-tests/go-task-get-method-same-deck.js: Copied from LayoutTests/wml/resources/go-task-get-method-same-deck.js.
+ * wml/script-tests/input-format.js: Copied from LayoutTests/wml/resources/input-format.js.
+ * wml/script-tests/newcontext-same-deck.js: Copied from LayoutTests/wml/resources/newcontext-same-deck.js.
+ * wml/script-tests/onenterforward-event.js: Copied from LayoutTests/wml/resources/onenterforward-event.js.
+ * wml/script-tests/onenterforward-inline-event.js: Copied from LayoutTests/wml/resources/onenterforward-inline-event.js.
+ * wml/script-tests/ontimer-event.js: Copied from LayoutTests/wml/resources/ontimer-event.js.
+ * wml/script-tests/ontimer-inline-event.js: Copied from LayoutTests/wml/resources/ontimer-inline-event.js.
+ * wml/script-tests/option-element-onpick-recursion.js: Copied from LayoutTests/wml/resources/option-element-onpick-recursion.js.
+ * wml/script-tests/option-element-onpick.js: Copied from LayoutTests/wml/resources/option-element-onpick.js.
+ * wml/script-tests/select-element-variables.js: Copied from LayoutTests/wml/resources/select-element-variables.js.
+ * wml/script-tests/variable-reference-invalid-character.js: Copied from LayoutTests/wml/resources/variable-reference-invalid-character.js.
+ * wml/script-tests/variable-reference-valid.js: Copied from LayoutTests/wml/resources/variable-reference-valid.js.
+ * wml/select-element-variables.html:
+ * wml/variable-reference-invalid-character.html:
+ * wml/variable-reference-valid.html:
+
+2009-09-19 Shinichiro Hamaji <hamaji@chromium.org>
+
+ Rubber-stamped by Eric Seidel.
+
+ js tests should move into jstests subdirectory instead of resources/
+ https://bugs.webkit.org/show_bug.cgi?id=25880
+
Migration for fast/* directories except fast js directory.
* fast/events/blur-focus-window-should-blur-focus-element.html:
diff --git a/LayoutTests/http/tests/cookies/double-quoted-value-with-semi-colon.html b/LayoutTests/http/tests/cookies/double-quoted-value-with-semi-colon.html
index d323096..0b06db7 100644
--- a/LayoutTests/http/tests/cookies/double-quoted-value-with-semi-colon.html
+++ b/LayoutTests/http/tests/cookies/double-quoted-value-with-semi-colon.html
@@ -7,7 +7,7 @@
<body>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/double-quoted-value-with-semi-colon.js"></script>
+<script src="script-tests/double-quoted-value-with-semi-colon.js"></script>
<script src="resources/cookies-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/http/tests/cookies/multiple-cookies.html b/LayoutTests/http/tests/cookies/multiple-cookies.html
index 05c5f1e..e5b14f3 100644
--- a/LayoutTests/http/tests/cookies/multiple-cookies.html
+++ b/LayoutTests/http/tests/cookies/multiple-cookies.html
@@ -7,7 +7,7 @@
<body>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/multiple-cookies.js"></script>
+<script src="script-tests/multiple-cookies.js"></script>
<script src="resources/cookies-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/http/tests/cookies/resources/TEMPLATE.html b/LayoutTests/http/tests/cookies/script-tests/TEMPLATE.html
similarity index 100%
rename from LayoutTests/http/tests/cookies/resources/TEMPLATE.html
rename to LayoutTests/http/tests/cookies/script-tests/TEMPLATE.html
diff --git a/LayoutTests/http/tests/cookies/resources/double-quoted-value-with-semi-colon.js b/LayoutTests/http/tests/cookies/script-tests/double-quoted-value-with-semi-colon.js
similarity index 100%
rename from LayoutTests/http/tests/cookies/resources/double-quoted-value-with-semi-colon.js
rename to LayoutTests/http/tests/cookies/script-tests/double-quoted-value-with-semi-colon.js
diff --git a/LayoutTests/http/tests/cookies/resources/multiple-cookies.js b/LayoutTests/http/tests/cookies/script-tests/multiple-cookies.js
similarity index 100%
rename from LayoutTests/http/tests/cookies/resources/multiple-cookies.js
rename to LayoutTests/http/tests/cookies/script-tests/multiple-cookies.js
diff --git a/LayoutTests/http/tests/cookies/resources/simple-cookies-expired.js b/LayoutTests/http/tests/cookies/script-tests/simple-cookies-expired.js
similarity index 100%
rename from LayoutTests/http/tests/cookies/resources/simple-cookies-expired.js
rename to LayoutTests/http/tests/cookies/script-tests/simple-cookies-expired.js
diff --git a/LayoutTests/http/tests/cookies/resources/simple-cookies-max-age.js b/LayoutTests/http/tests/cookies/script-tests/simple-cookies-max-age.js
similarity index 100%
rename from LayoutTests/http/tests/cookies/resources/simple-cookies-max-age.js
rename to LayoutTests/http/tests/cookies/script-tests/simple-cookies-max-age.js
diff --git a/LayoutTests/http/tests/cookies/simple-cookies-expired.html b/LayoutTests/http/tests/cookies/simple-cookies-expired.html
index bf22211..6015d0d 100644
--- a/LayoutTests/http/tests/cookies/simple-cookies-expired.html
+++ b/LayoutTests/http/tests/cookies/simple-cookies-expired.html
@@ -7,7 +7,7 @@
<body>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/simple-cookies-expired.js"></script>
+<script src="script-tests/simple-cookies-expired.js"></script>
<script src="resources/cookies-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/http/tests/cookies/simple-cookies-max-age.html b/LayoutTests/http/tests/cookies/simple-cookies-max-age.html
index 708c658..23eee96 100644
--- a/LayoutTests/http/tests/cookies/simple-cookies-max-age.html
+++ b/LayoutTests/http/tests/cookies/simple-cookies-max-age.html
@@ -7,7 +7,7 @@
<body>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/simple-cookies-max-age.js"></script>
+<script src="script-tests/simple-cookies-max-age.js"></script>
<script src="resources/cookies-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/http/tests/security/clipboard/clipboard-file-access.html b/LayoutTests/http/tests/security/clipboard/clipboard-file-access.html
index 1e325ae..0a474f2 100644
--- a/LayoutTests/http/tests/security/clipboard/clipboard-file-access.html
+++ b/LayoutTests/http/tests/security/clipboard/clipboard-file-access.html
@@ -7,7 +7,7 @@
<body>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/clipboard-file-access.js"></script>
+<script src="script-tests/clipboard-file-access.js"></script>
<script src="../../js-test-resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/http/tests/security/clipboard/resources/TEMPLATE.html b/LayoutTests/http/tests/security/clipboard/script-tests/TEMPLATE.html
similarity index 100%
rename from LayoutTests/http/tests/security/clipboard/resources/TEMPLATE.html
rename to LayoutTests/http/tests/security/clipboard/script-tests/TEMPLATE.html
diff --git a/LayoutTests/http/tests/security/clipboard/resources/clipboard-file-access.js b/LayoutTests/http/tests/security/clipboard/script-tests/clipboard-file-access.js
similarity index 100%
rename from LayoutTests/http/tests/security/clipboard/resources/clipboard-file-access.js
rename to LayoutTests/http/tests/security/clipboard/script-tests/clipboard-file-access.js
diff --git a/LayoutTests/http/tests/wml/access-target-domain-deny.html b/LayoutTests/http/tests/wml/access-target-domain-deny.html
index b359cf3..cfadf52 100644
--- a/LayoutTests/http/tests/wml/access-target-domain-deny.html
+++ b/LayoutTests/http/tests/wml/access-target-domain-deny.html
@@ -10,6 +10,6 @@
<h1>WML http navigation layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/access-target-domain-deny.js" charset="utf8"></script>
+<script src="script-tests/access-target-domain-deny.js" charset="utf8"></script>
</body>
</html>
diff --git a/LayoutTests/http/tests/wml/access-target-path-deny.html b/LayoutTests/http/tests/wml/access-target-path-deny.html
index 82d817e..f084842 100644
--- a/LayoutTests/http/tests/wml/access-target-path-deny.html
+++ b/LayoutTests/http/tests/wml/access-target-path-deny.html
@@ -10,6 +10,6 @@
<h1>WML http navigation layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/access-target-path-deny.js" charset="utf8"></script>
+<script src="script-tests/access-target-path-deny.js" charset="utf8"></script>
</body>
</html>
diff --git a/LayoutTests/http/tests/wml/access-target.html b/LayoutTests/http/tests/wml/access-target.html
index 7b515ec..9360c7a 100644
--- a/LayoutTests/http/tests/wml/access-target.html
+++ b/LayoutTests/http/tests/wml/access-target.html
@@ -10,6 +10,6 @@
<h1>WML http navigation layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/access-target.js" charset="utf8"></script>
+<script src="script-tests/access-target.js" charset="utf8"></script>
</body>
</html>
diff --git a/LayoutTests/http/tests/wml/go-task-get-method-accept-charset.html b/LayoutTests/http/tests/wml/go-task-get-method-accept-charset.html
index 6b82dd2..1e9663a 100644
--- a/LayoutTests/http/tests/wml/go-task-get-method-accept-charset.html
+++ b/LayoutTests/http/tests/wml/go-task-get-method-accept-charset.html
@@ -10,6 +10,6 @@
<h1>WML http navigation layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/go-task-get-method-accept-charset.js" charset="utf8"></script>
+<script src="script-tests/go-task-get-method-accept-charset.js" charset="utf8"></script>
</body>
</html>
diff --git a/LayoutTests/http/tests/wml/go-task-get-method.html b/LayoutTests/http/tests/wml/go-task-get-method.html
index 6d1b8c4..6cdf214 100644
--- a/LayoutTests/http/tests/wml/go-task-get-method.html
+++ b/LayoutTests/http/tests/wml/go-task-get-method.html
@@ -10,6 +10,6 @@
<h1>WML http navigation layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/go-task-get-method.js" charset="utf8"></script>
+<script src="script-tests/go-task-get-method.js" charset="utf8"></script>
</body>
</html>
diff --git a/LayoutTests/http/tests/wml/go-task-post-method-accept-charset.html b/LayoutTests/http/tests/wml/go-task-post-method-accept-charset.html
index e2aac65..e3a65de 100644
--- a/LayoutTests/http/tests/wml/go-task-post-method-accept-charset.html
+++ b/LayoutTests/http/tests/wml/go-task-post-method-accept-charset.html
@@ -10,6 +10,6 @@
<h1>WML http navigation layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/go-task-post-method-accept-charset.js" charset="utf8"></script>
+<script src="script-tests/go-task-post-method-accept-charset.js" charset="utf8"></script>
</body>
</html>
diff --git a/LayoutTests/http/tests/wml/go-task-post-method.html b/LayoutTests/http/tests/wml/go-task-post-method.html
index ecd9fd6..768d489 100644
--- a/LayoutTests/http/tests/wml/go-task-post-method.html
+++ b/LayoutTests/http/tests/wml/go-task-post-method.html
@@ -10,6 +10,6 @@
<h1>WML http navigation layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/go-task-post-method.js" charset="utf8"></script>
+<script src="script-tests/go-task-post-method.js" charset="utf8"></script>
</body>
</html>
diff --git a/LayoutTests/http/tests/wml/post-data-to-server.html b/LayoutTests/http/tests/wml/post-data-to-server.html
index 7c647dc..110375d 100644
--- a/LayoutTests/http/tests/wml/post-data-to-server.html
+++ b/LayoutTests/http/tests/wml/post-data-to-server.html
@@ -10,6 +10,6 @@
<h1>WML http navigation layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/post-data-to-server.js" charset="utf8"></script>
+<script src="script-tests/post-data-to-server.js" charset="utf8"></script>
</body>
</html>
diff --git a/LayoutTests/http/tests/wml/resources/TEMPLATE.html b/LayoutTests/http/tests/wml/script-tests/TEMPLATE.html
similarity index 100%
rename from LayoutTests/http/tests/wml/resources/TEMPLATE.html
rename to LayoutTests/http/tests/wml/script-tests/TEMPLATE.html
diff --git a/LayoutTests/http/tests/wml/resources/access-target-domain-deny.js b/LayoutTests/http/tests/wml/script-tests/access-target-domain-deny.js
similarity index 100%
rename from LayoutTests/http/tests/wml/resources/access-target-domain-deny.js
rename to LayoutTests/http/tests/wml/script-tests/access-target-domain-deny.js
diff --git a/LayoutTests/http/tests/wml/resources/access-target-path-deny.js b/LayoutTests/http/tests/wml/script-tests/access-target-path-deny.js
similarity index 100%
rename from LayoutTests/http/tests/wml/resources/access-target-path-deny.js
rename to LayoutTests/http/tests/wml/script-tests/access-target-path-deny.js
diff --git a/LayoutTests/http/tests/wml/resources/access-target.js b/LayoutTests/http/tests/wml/script-tests/access-target.js
similarity index 100%
rename from LayoutTests/http/tests/wml/resources/access-target.js
rename to LayoutTests/http/tests/wml/script-tests/access-target.js
diff --git a/LayoutTests/http/tests/wml/resources/go-task-get-method-accept-charset.js b/LayoutTests/http/tests/wml/script-tests/go-task-get-method-accept-charset.js
similarity index 100%
rename from LayoutTests/http/tests/wml/resources/go-task-get-method-accept-charset.js
rename to LayoutTests/http/tests/wml/script-tests/go-task-get-method-accept-charset.js
diff --git a/LayoutTests/http/tests/wml/resources/go-task-get-method.js b/LayoutTests/http/tests/wml/script-tests/go-task-get-method.js
similarity index 100%
rename from LayoutTests/http/tests/wml/resources/go-task-get-method.js
rename to LayoutTests/http/tests/wml/script-tests/go-task-get-method.js
diff --git a/LayoutTests/http/tests/wml/resources/go-task-post-method-accept-charset.js b/LayoutTests/http/tests/wml/script-tests/go-task-post-method-accept-charset.js
similarity index 100%
rename from LayoutTests/http/tests/wml/resources/go-task-post-method-accept-charset.js
rename to LayoutTests/http/tests/wml/script-tests/go-task-post-method-accept-charset.js
diff --git a/LayoutTests/http/tests/wml/resources/go-task-post-method.js b/LayoutTests/http/tests/wml/script-tests/go-task-post-method.js
similarity index 100%
rename from LayoutTests/http/tests/wml/resources/go-task-post-method.js
rename to LayoutTests/http/tests/wml/script-tests/go-task-post-method.js
diff --git a/LayoutTests/http/tests/wml/resources/post-data-to-server.js b/LayoutTests/http/tests/wml/script-tests/post-data-to-server.js
similarity index 100%
rename from LayoutTests/http/tests/wml/resources/post-data-to-server.js
rename to LayoutTests/http/tests/wml/script-tests/post-data-to-server.js
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/resources/TEMPLATE.html b/LayoutTests/platform/gtk/editing/pasteboard/script-tests/TEMPLATE.html
similarity index 100%
rename from LayoutTests/platform/gtk/editing/pasteboard/resources/TEMPLATE.html
rename to LayoutTests/platform/gtk/editing/pasteboard/script-tests/TEMPLATE.html
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/resources/middle-click-onpaste.js b/LayoutTests/platform/gtk/editing/pasteboard/script-tests/middle-click-onpaste.js
similarity index 100%
rename from LayoutTests/platform/gtk/editing/pasteboard/resources/middle-click-onpaste.js
rename to LayoutTests/platform/gtk/editing/pasteboard/script-tests/middle-click-onpaste.js
diff --git a/LayoutTests/platform/win/fast/events/context-click-events.html b/LayoutTests/platform/win/fast/events/context-click-events.html
index 03ce1f0..604ce96 100644
--- a/LayoutTests/platform/win/fast/events/context-click-events.html
+++ b/LayoutTests/platform/win/fast/events/context-click-events.html
@@ -7,7 +7,7 @@
<body>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/context-click-events.js"></script>
+<script src="script-tests/context-click-events.js"></script>
<script src="../../../../fast/js/resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/platform/win/fast/events/resources/TEMPLATE.html b/LayoutTests/platform/win/fast/events/script-tests/TEMPLATE.html
similarity index 100%
rename from LayoutTests/platform/win/fast/events/resources/TEMPLATE.html
rename to LayoutTests/platform/win/fast/events/script-tests/TEMPLATE.html
diff --git a/LayoutTests/platform/win/fast/events/resources/context-click-events.js b/LayoutTests/platform/win/fast/events/script-tests/context-click-events.js
similarity index 100%
rename from LayoutTests/platform/win/fast/events/resources/context-click-events.js
rename to LayoutTests/platform/win/fast/events/script-tests/context-click-events.js
diff --git a/LayoutTests/plugins/netscape-identifier-conversion.html b/LayoutTests/plugins/netscape-identifier-conversion.html
index 248fb32..8390c43 100644
--- a/LayoutTests/plugins/netscape-identifier-conversion.html
+++ b/LayoutTests/plugins/netscape-identifier-conversion.html
@@ -7,7 +7,7 @@
<body>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/netscape-identifier-conversion.js"></script>
+<script src="script-tests/netscape-identifier-conversion.js"></script>
<script src="../fast/js/resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/plugins/resources/TEMPLATE.html b/LayoutTests/plugins/script-tests/TEMPLATE.html
similarity index 100%
rename from LayoutTests/plugins/resources/TEMPLATE.html
rename to LayoutTests/plugins/script-tests/TEMPLATE.html
diff --git a/LayoutTests/plugins/resources/netscape-identifier-conversion.js b/LayoutTests/plugins/script-tests/netscape-identifier-conversion.js
similarity index 100%
rename from LayoutTests/plugins/resources/netscape-identifier-conversion.js
rename to LayoutTests/plugins/script-tests/netscape-identifier-conversion.js
diff --git a/LayoutTests/traversal/acid3-test-2.html b/LayoutTests/traversal/acid3-test-2.html
index 8221aa9..f594829 100644
--- a/LayoutTests/traversal/acid3-test-2.html
+++ b/LayoutTests/traversal/acid3-test-2.html
@@ -7,7 +7,7 @@
<body>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/acid3-test-2.js"></script>
+<script src="script-tests/acid3-test-2.js"></script>
<script src="../fast/js/resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/traversal/exception-forwarding.html b/LayoutTests/traversal/exception-forwarding.html
index ea76897..2986b1d 100644
--- a/LayoutTests/traversal/exception-forwarding.html
+++ b/LayoutTests/traversal/exception-forwarding.html
@@ -7,7 +7,7 @@
<body>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/exception-forwarding.js"></script>
+<script src="script-tests/exception-forwarding.js"></script>
<script src="../fast/js/resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/traversal/resources/TEMPLATE.html b/LayoutTests/traversal/script-tests/TEMPLATE.html
similarity index 100%
rename from LayoutTests/traversal/resources/TEMPLATE.html
rename to LayoutTests/traversal/script-tests/TEMPLATE.html
diff --git a/LayoutTests/traversal/resources/acid3-test-2.js b/LayoutTests/traversal/script-tests/acid3-test-2.js
similarity index 100%
rename from LayoutTests/traversal/resources/acid3-test-2.js
rename to LayoutTests/traversal/script-tests/acid3-test-2.js
diff --git a/LayoutTests/traversal/resources/exception-forwarding.js b/LayoutTests/traversal/script-tests/exception-forwarding.js
similarity index 100%
rename from LayoutTests/traversal/resources/exception-forwarding.js
rename to LayoutTests/traversal/script-tests/exception-forwarding.js
diff --git a/LayoutTests/wml/access-target-deny.html b/LayoutTests/wml/access-target-deny.html
index a5b2cad..b13c08c 100644
--- a/LayoutTests/wml/access-target-deny.html
+++ b/LayoutTests/wml/access-target-deny.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/access-target-deny.js"></script>
+<script src="script-tests/access-target-deny.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/access-target.html b/LayoutTests/wml/access-target.html
index c8e9ef1..798f1bb 100644
--- a/LayoutTests/wml/access-target.html
+++ b/LayoutTests/wml/access-target.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/access-target.js"></script>
+<script src="script-tests/access-target.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/enter-card-with-events.html b/LayoutTests/wml/enter-card-with-events.html
index 26f1ac2..66ee26b 100644
--- a/LayoutTests/wml/enter-card-with-events.html
+++ b/LayoutTests/wml/enter-card-with-events.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/enter-card-with-events.js"></script>
+<script src="script-tests/enter-card-with-events.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/enter-first-card-with-events.html b/LayoutTests/wml/enter-first-card-with-events.html
index c81dcc6..e94d150 100644
--- a/LayoutTests/wml/enter-first-card-with-events.html
+++ b/LayoutTests/wml/enter-first-card-with-events.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/enter-first-card-with-events.js"></script>
+<script src="script-tests/enter-first-card-with-events.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/go-task-get-method-external-deck-with-href.html b/LayoutTests/wml/go-task-get-method-external-deck-with-href.html
index c697686..4fb0976 100644
--- a/LayoutTests/wml/go-task-get-method-external-deck-with-href.html
+++ b/LayoutTests/wml/go-task-get-method-external-deck-with-href.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/go-task-get-method-external-deck-with-href.js"></script>
+<script src="script-tests/go-task-get-method-external-deck-with-href.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/go-task-get-method-external-deck.html b/LayoutTests/wml/go-task-get-method-external-deck.html
index a3c26b9..ba398c6 100644
--- a/LayoutTests/wml/go-task-get-method-external-deck.html
+++ b/LayoutTests/wml/go-task-get-method-external-deck.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/go-task-get-method-external-deck.js"></script>
+<script src="script-tests/go-task-get-method-external-deck.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/go-task-get-method-same-deck.html b/LayoutTests/wml/go-task-get-method-same-deck.html
index 8b0391d..b539ab0 100644
--- a/LayoutTests/wml/go-task-get-method-same-deck.html
+++ b/LayoutTests/wml/go-task-get-method-same-deck.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/go-task-get-method-same-deck.js"></script>
+<script src="script-tests/go-task-get-method-same-deck.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/input-format.html b/LayoutTests/wml/input-format.html
index d733d3b..7eb2dff 100644
--- a/LayoutTests/wml/input-format.html
+++ b/LayoutTests/wml/input-format.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/input-format.js"></script>
+<script src="script-tests/input-format.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/newcontext-same-deck.html b/LayoutTests/wml/newcontext-same-deck.html
index 5e2f090..b7d9103 100644
--- a/LayoutTests/wml/newcontext-same-deck.html
+++ b/LayoutTests/wml/newcontext-same-deck.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/newcontext-same-deck.js"></script>
+<script src="script-tests/newcontext-same-deck.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/onenterforward-event.html b/LayoutTests/wml/onenterforward-event.html
index 076767f..4329ead 100644
--- a/LayoutTests/wml/onenterforward-event.html
+++ b/LayoutTests/wml/onenterforward-event.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/onenterforward-event.js"></script>
+<script src="script-tests/onenterforward-event.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/onenterforward-inline-event.html b/LayoutTests/wml/onenterforward-inline-event.html
index cb2ad5c..92ac615 100644
--- a/LayoutTests/wml/onenterforward-inline-event.html
+++ b/LayoutTests/wml/onenterforward-inline-event.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/onenterforward-inline-event.js"></script>
+<script src="script-tests/onenterforward-inline-event.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/ontimer-event.html b/LayoutTests/wml/ontimer-event.html
index 1e936af..11fc69b 100644
--- a/LayoutTests/wml/ontimer-event.html
+++ b/LayoutTests/wml/ontimer-event.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/ontimer-event.js"></script>
+<script src="script-tests/ontimer-event.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/ontimer-inline-event.html b/LayoutTests/wml/ontimer-inline-event.html
index 4d4f4ed..7edfac9 100644
--- a/LayoutTests/wml/ontimer-inline-event.html
+++ b/LayoutTests/wml/ontimer-inline-event.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/ontimer-inline-event.js"></script>
+<script src="script-tests/ontimer-inline-event.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/option-element-onpick-recursion.html b/LayoutTests/wml/option-element-onpick-recursion.html
index d077796..eb2f4c3 100644
--- a/LayoutTests/wml/option-element-onpick-recursion.html
+++ b/LayoutTests/wml/option-element-onpick-recursion.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/option-element-onpick-recursion.js"></script>
+<script src="script-tests/option-element-onpick-recursion.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/option-element-onpick.html b/LayoutTests/wml/option-element-onpick.html
index da1a69a..33c0d87 100644
--- a/LayoutTests/wml/option-element-onpick.html
+++ b/LayoutTests/wml/option-element-onpick.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/option-element-onpick.js"></script>
+<script src="script-tests/option-element-onpick.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/resources/TEMPLATE.html b/LayoutTests/wml/script-tests/TEMPLATE.html
similarity index 100%
rename from LayoutTests/wml/resources/TEMPLATE.html
rename to LayoutTests/wml/script-tests/TEMPLATE.html
diff --git a/LayoutTests/wml/resources/access-target-deny.js b/LayoutTests/wml/script-tests/access-target-deny.js
similarity index 100%
rename from LayoutTests/wml/resources/access-target-deny.js
rename to LayoutTests/wml/script-tests/access-target-deny.js
diff --git a/LayoutTests/wml/resources/access-target.js b/LayoutTests/wml/script-tests/access-target.js
similarity index 100%
rename from LayoutTests/wml/resources/access-target.js
rename to LayoutTests/wml/script-tests/access-target.js
diff --git a/LayoutTests/wml/resources/enter-card-with-events.js b/LayoutTests/wml/script-tests/enter-card-with-events.js
similarity index 100%
rename from LayoutTests/wml/resources/enter-card-with-events.js
rename to LayoutTests/wml/script-tests/enter-card-with-events.js
diff --git a/LayoutTests/wml/resources/enter-first-card-with-events.js b/LayoutTests/wml/script-tests/enter-first-card-with-events.js
similarity index 100%
rename from LayoutTests/wml/resources/enter-first-card-with-events.js
rename to LayoutTests/wml/script-tests/enter-first-card-with-events.js
diff --git a/LayoutTests/wml/resources/go-task-get-method-external-deck-with-href.js b/LayoutTests/wml/script-tests/go-task-get-method-external-deck-with-href.js
similarity index 100%
rename from LayoutTests/wml/resources/go-task-get-method-external-deck-with-href.js
rename to LayoutTests/wml/script-tests/go-task-get-method-external-deck-with-href.js
diff --git a/LayoutTests/wml/resources/go-task-get-method-external-deck.js b/LayoutTests/wml/script-tests/go-task-get-method-external-deck.js
similarity index 100%
rename from LayoutTests/wml/resources/go-task-get-method-external-deck.js
rename to LayoutTests/wml/script-tests/go-task-get-method-external-deck.js
diff --git a/LayoutTests/wml/resources/go-task-get-method-same-deck.js b/LayoutTests/wml/script-tests/go-task-get-method-same-deck.js
similarity index 100%
rename from LayoutTests/wml/resources/go-task-get-method-same-deck.js
rename to LayoutTests/wml/script-tests/go-task-get-method-same-deck.js
diff --git a/LayoutTests/wml/resources/input-format.js b/LayoutTests/wml/script-tests/input-format.js
similarity index 100%
rename from LayoutTests/wml/resources/input-format.js
rename to LayoutTests/wml/script-tests/input-format.js
diff --git a/LayoutTests/wml/resources/newcontext-same-deck.js b/LayoutTests/wml/script-tests/newcontext-same-deck.js
similarity index 100%
rename from LayoutTests/wml/resources/newcontext-same-deck.js
rename to LayoutTests/wml/script-tests/newcontext-same-deck.js
diff --git a/LayoutTests/wml/resources/onenterforward-event.js b/LayoutTests/wml/script-tests/onenterforward-event.js
similarity index 100%
rename from LayoutTests/wml/resources/onenterforward-event.js
rename to LayoutTests/wml/script-tests/onenterforward-event.js
diff --git a/LayoutTests/wml/resources/onenterforward-inline-event.js b/LayoutTests/wml/script-tests/onenterforward-inline-event.js
similarity index 100%
rename from LayoutTests/wml/resources/onenterforward-inline-event.js
rename to LayoutTests/wml/script-tests/onenterforward-inline-event.js
diff --git a/LayoutTests/wml/resources/ontimer-event.js b/LayoutTests/wml/script-tests/ontimer-event.js
similarity index 100%
rename from LayoutTests/wml/resources/ontimer-event.js
rename to LayoutTests/wml/script-tests/ontimer-event.js
diff --git a/LayoutTests/wml/resources/ontimer-inline-event.js b/LayoutTests/wml/script-tests/ontimer-inline-event.js
similarity index 100%
rename from LayoutTests/wml/resources/ontimer-inline-event.js
rename to LayoutTests/wml/script-tests/ontimer-inline-event.js
diff --git a/LayoutTests/wml/resources/option-element-onpick-recursion.js b/LayoutTests/wml/script-tests/option-element-onpick-recursion.js
similarity index 100%
rename from LayoutTests/wml/resources/option-element-onpick-recursion.js
rename to LayoutTests/wml/script-tests/option-element-onpick-recursion.js
diff --git a/LayoutTests/wml/resources/option-element-onpick.js b/LayoutTests/wml/script-tests/option-element-onpick.js
similarity index 100%
rename from LayoutTests/wml/resources/option-element-onpick.js
rename to LayoutTests/wml/script-tests/option-element-onpick.js
diff --git a/LayoutTests/wml/resources/select-element-variables.js b/LayoutTests/wml/script-tests/select-element-variables.js
similarity index 100%
rename from LayoutTests/wml/resources/select-element-variables.js
rename to LayoutTests/wml/script-tests/select-element-variables.js
diff --git a/LayoutTests/wml/resources/variable-reference-invalid-character.js b/LayoutTests/wml/script-tests/variable-reference-invalid-character.js
similarity index 100%
rename from LayoutTests/wml/resources/variable-reference-invalid-character.js
rename to LayoutTests/wml/script-tests/variable-reference-invalid-character.js
diff --git a/LayoutTests/wml/resources/variable-reference-valid.js b/LayoutTests/wml/script-tests/variable-reference-valid.js
similarity index 100%
rename from LayoutTests/wml/resources/variable-reference-valid.js
rename to LayoutTests/wml/script-tests/variable-reference-valid.js
diff --git a/LayoutTests/wml/select-element-variables.html b/LayoutTests/wml/select-element-variables.html
index e0ed6af..cfbd067 100644
--- a/LayoutTests/wml/select-element-variables.html
+++ b/LayoutTests/wml/select-element-variables.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/select-element-variables.js"></script>
+<script src="script-tests/select-element-variables.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/variable-reference-invalid-character.html b/LayoutTests/wml/variable-reference-invalid-character.html
index adc976e..fb7cf53 100644
--- a/LayoutTests/wml/variable-reference-invalid-character.html
+++ b/LayoutTests/wml/variable-reference-invalid-character.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/variable-reference-invalid-character.js"></script>
+<script src="script-tests/variable-reference-invalid-character.js"></script>
</body>
</html>
diff --git a/LayoutTests/wml/variable-reference-valid.html b/LayoutTests/wml/variable-reference-valid.html
index c46e298..bf4a61e 100644
--- a/LayoutTests/wml/variable-reference-valid.html
+++ b/LayoutTests/wml/variable-reference-valid.html
@@ -10,6 +10,6 @@
<h1>WML layout tests - using XHTML scripting</h1>
<p id="description"></p>
<div id="console"></div>
-<script src="resources/variable-reference-valid.js"></script>
+<script src="script-tests/variable-reference-valid.js"></script>
</body>
</html>
