diff --git a/dom/Makefile.in b/dom/Makefile.in index cbd083df86b8..cc8cdfd594d4 100644 --- a/dom/Makefile.in +++ b/dom/Makefile.in @@ -105,7 +105,12 @@ DIRS += \ bluetooth \ $(NULL) endif -TEST_DIRS += tests + +TEST_DIRS += \ + tests \ + imported-tests \ + $(NULL) + ifneq (,$(filter gtk2 cocoa windows android qt os2,$(MOZ_WIDGET_TOOLKIT))) TEST_DIRS += plugins/test endif diff --git a/dom/tests/mochitest/w3c/Makefile.in b/dom/imported-tests/Makefile.in similarity index 92% rename from dom/tests/mochitest/w3c/Makefile.in rename to dom/imported-tests/Makefile.in index 1dccfaed73d8..f0f7710e3b94 100644 --- a/dom/tests/mochitest/w3c/Makefile.in +++ b/dom/imported-tests/Makefile.in @@ -2,11 +2,11 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -relativesrcdir = dom/tests/mochitest/w3c +relativesrcdir = dom/imported-tests DIRS = \ $(NULL) diff --git a/dom/tests/mochitest/w3c/README b/dom/imported-tests/README similarity index 100% rename from dom/tests/mochitest/w3c/README rename to dom/imported-tests/README diff --git a/dom/tests/mochitest/w3c/WebIDLParser.js b/dom/imported-tests/WebIDLParser.js similarity index 100% rename from dom/tests/mochitest/w3c/WebIDLParser.js rename to dom/imported-tests/WebIDLParser.js diff --git a/dom/tests/mochitest/w3c/failures.txt b/dom/imported-tests/failures.txt similarity index 100% rename from dom/tests/mochitest/w3c/failures.txt rename to dom/imported-tests/failures.txt diff --git a/dom/tests/mochitest/w3c/html.json b/dom/imported-tests/html.json similarity index 100% rename from dom/tests/mochitest/w3c/html.json rename to dom/imported-tests/html.json diff --git a/dom/tests/mochitest/w3c/html.mk b/dom/imported-tests/html.mk similarity index 100% rename from dom/tests/mochitest/w3c/html.mk rename to dom/imported-tests/html.mk diff --git a/dom/tests/mochitest/w3c/html.txt b/dom/imported-tests/html.txt similarity index 100% rename from dom/tests/mochitest/w3c/html.txt rename to dom/imported-tests/html.txt diff --git a/dom/tests/mochitest/w3c/html/tests/submission/Mozilla/Makefile.in b/dom/imported-tests/html/tests/submission/Mozilla/Makefile.in similarity index 86% rename from dom/tests/mochitest/w3c/html/tests/submission/Mozilla/Makefile.in rename to dom/imported-tests/html/tests/submission/Mozilla/Makefile.in index 90a0da45faea..8b4cd6cbbfa3 100644 --- a/dom/tests/mochitest/w3c/html/tests/submission/Mozilla/Makefile.in +++ b/dom/imported-tests/html/tests/submission/Mozilla/Makefile.in @@ -1,11 +1,11 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH = ../../../../../../../.. +DEPTH = ../../../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -relativesrcdir = dom/tests/mochitest/w3c/html/tests/submission/Mozilla +relativesrcdir = dom/imported-tests/html/tests/submission/Mozilla DIRS = \ $(NULL) diff --git a/dom/tests/mochitest/w3c/html/tests/submission/Mozilla/nested-document-write-external.js b/dom/imported-tests/html/tests/submission/Mozilla/nested-document-write-external.js similarity index 100% rename from dom/tests/mochitest/w3c/html/tests/submission/Mozilla/nested-document-write-external.js rename to dom/imported-tests/html/tests/submission/Mozilla/nested-document-write-external.js diff --git a/dom/tests/mochitest/w3c/html/tests/submission/Mozilla/test_body-onload.html b/dom/imported-tests/html/tests/submission/Mozilla/test_body-onload.html similarity index 100% rename from dom/tests/mochitest/w3c/html/tests/submission/Mozilla/test_body-onload.html rename to dom/imported-tests/html/tests/submission/Mozilla/test_body-onload.html diff --git a/dom/tests/mochitest/w3c/html/tests/submission/Mozilla/test_pageload-image.html b/dom/imported-tests/html/tests/submission/Mozilla/test_pageload-image.html similarity index 100% rename from dom/tests/mochitest/w3c/html/tests/submission/Mozilla/test_pageload-image.html rename to dom/imported-tests/html/tests/submission/Mozilla/test_pageload-image.html diff --git a/dom/tests/mochitest/w3c/html/tests/submission/Mozilla/test_pageload-video.html b/dom/imported-tests/html/tests/submission/Mozilla/test_pageload-video.html similarity index 100% rename from dom/tests/mochitest/w3c/html/tests/submission/Mozilla/test_pageload-video.html rename to dom/imported-tests/html/tests/submission/Mozilla/test_pageload-video.html diff --git a/dom/tests/mochitest/w3c/html/tests/submission/Mozilla/test_script-for-onload.html b/dom/imported-tests/html/tests/submission/Mozilla/test_script-for-onload.html similarity index 100% rename from dom/tests/mochitest/w3c/html/tests/submission/Mozilla/test_script-for-onload.html rename to dom/imported-tests/html/tests/submission/Mozilla/test_script-for-onload.html diff --git a/dom/tests/mochitest/w3c/html/tests/submission/Mozilla/test_window-onerror-parse-error.html b/dom/imported-tests/html/tests/submission/Mozilla/test_window-onerror-parse-error.html similarity index 100% rename from dom/tests/mochitest/w3c/html/tests/submission/Mozilla/test_window-onerror-parse-error.html rename to dom/imported-tests/html/tests/submission/Mozilla/test_window-onerror-parse-error.html diff --git a/dom/tests/mochitest/w3c/html/tests/submission/Mozilla/test_window-onerror-runtime-error-throw.html b/dom/imported-tests/html/tests/submission/Mozilla/test_window-onerror-runtime-error-throw.html similarity index 100% rename from dom/tests/mochitest/w3c/html/tests/submission/Mozilla/test_window-onerror-runtime-error-throw.html rename to dom/imported-tests/html/tests/submission/Mozilla/test_window-onerror-runtime-error-throw.html diff --git a/dom/tests/mochitest/w3c/html/tests/submission/Mozilla/test_window-onerror-runtime-error.html b/dom/imported-tests/html/tests/submission/Mozilla/test_window-onerror-runtime-error.html similarity index 100% rename from dom/tests/mochitest/w3c/html/tests/submission/Mozilla/test_window-onerror-runtime-error.html rename to dom/imported-tests/html/tests/submission/Mozilla/test_window-onerror-runtime-error.html diff --git a/dom/tests/mochitest/w3c/idlharness.js b/dom/imported-tests/idlharness.js similarity index 100% rename from dom/tests/mochitest/w3c/idlharness.js rename to dom/imported-tests/idlharness.js diff --git a/dom/tests/mochitest/w3c/importTestsuite.py b/dom/imported-tests/importTestsuite.py similarity index 98% rename from dom/tests/mochitest/w3c/importTestsuite.py rename to dom/imported-tests/importTestsuite.py index d1f357490452..47fbbcd2d961 100755 --- a/dom/tests/mochitest/w3c/importTestsuite.py +++ b/dom/imported-tests/importTestsuite.py @@ -174,4 +174,4 @@ if __name__ == "__main__": if len(sys.argv) != 2: print "Need one argument." else: - importRepo(sys.argv[1], "dom/tests/mochitest/w3c") + importRepo(sys.argv[1], "dom/imported-tests") diff --git a/dom/tests/mochitest/w3c/parseManifest.py b/dom/imported-tests/parseManifest.py similarity index 100% rename from dom/tests/mochitest/w3c/parseManifest.py rename to dom/imported-tests/parseManifest.py diff --git a/dom/tests/mochitest/w3c/testharness.css b/dom/imported-tests/testharness.css similarity index 100% rename from dom/tests/mochitest/w3c/testharness.css rename to dom/imported-tests/testharness.css diff --git a/dom/tests/mochitest/w3c/testharness.js b/dom/imported-tests/testharness.js similarity index 100% rename from dom/tests/mochitest/w3c/testharness.js rename to dom/imported-tests/testharness.js diff --git a/dom/tests/mochitest/w3c/testharnessreport.js.in b/dom/imported-tests/testharnessreport.js.in similarity index 97% rename from dom/tests/mochitest/w3c/testharnessreport.js.in rename to dom/imported-tests/testharnessreport.js.in index 540adc5c58c5..e13ad14db0e8 100644 --- a/dom/tests/mochitest/w3c/testharnessreport.js.in +++ b/dom/imported-tests/testharnessreport.js.in @@ -38,7 +38,7 @@ var W3CTest = { * directory. Used as a key into the expectedFailures dictionary. */ "getURL": function() { - return this.runner.currentTestURL.substring("/tests/dom/tests/mochitest/w3c/".length); + return this.runner.currentTestURL.substring("/tests/dom/imported-tests/".length); }, /** diff --git a/dom/tests/mochitest/w3c/updateTestharness.py b/dom/imported-tests/updateTestharness.py similarity index 100% rename from dom/tests/mochitest/w3c/updateTestharness.py rename to dom/imported-tests/updateTestharness.py diff --git a/dom/tests/mochitest/w3c/webapps.json b/dom/imported-tests/webapps.json similarity index 100% rename from dom/tests/mochitest/w3c/webapps.json rename to dom/imported-tests/webapps.json diff --git a/dom/tests/mochitest/w3c/webapps.mk b/dom/imported-tests/webapps.mk similarity index 100% rename from dom/tests/mochitest/w3c/webapps.mk rename to dom/imported-tests/webapps.mk diff --git a/dom/tests/mochitest/w3c/webapps.txt b/dom/imported-tests/webapps.txt similarity index 100% rename from dom/tests/mochitest/w3c/webapps.txt rename to dom/imported-tests/webapps.txt diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/Makefile.in b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/Makefile.in similarity index 90% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/Makefile.in rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/Makefile.in index e7ec3f5a746e..1c85dc41e7c5 100644 --- a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/Makefile.in +++ b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/Makefile.in @@ -1,11 +1,11 @@ # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT -DEPTH = ../../../../../../../../.. +DEPTH = ../../../../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -relativesrcdir = dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera +relativesrcdir = dom/imported-tests/webapps/DOMCore/tests/submissions/Opera DIRS = \ $(NULL) diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-01.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-01.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-01.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-01.htm diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-02.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-02.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-02.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-02.htm diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-03.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-03.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-03.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-03.htm diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-04.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-04.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-04.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-04.htm diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-05.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-05.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-05.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-05.htm diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-06.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-06.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-06.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-06.htm diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-07.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-07.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-07.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-07.htm diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-08.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-08.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-08.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-08.htm diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-09.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-09.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-09.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-09.htm diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-10.xml b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-10.xml similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-10.xml rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-10.xml diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-11.xml b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-11.xml similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-11.xml rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-11.xml diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-12.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-12.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-12.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-12.htm diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-13.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-13.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-13.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-13.htm diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-14.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-14.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-14.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-14.htm diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-15.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-15.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-15.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-15.htm diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-16.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-16.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-16.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-16.htm diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-17.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-17.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-17.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-17.htm diff --git a/dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-18.htm b/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-18.htm similarity index 100% rename from dom/tests/mochitest/w3c/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-18.htm rename to dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-18.htm diff --git a/dom/tests/mochitest/w3c/writeReporter.py b/dom/imported-tests/writeReporter.py similarity index 100% rename from dom/tests/mochitest/w3c/writeReporter.py rename to dom/imported-tests/writeReporter.py diff --git a/dom/tests/mochitest/Makefile.in b/dom/tests/mochitest/Makefile.in index 3c299898baaa..98db102b7b9c 100644 --- a/dom/tests/mochitest/Makefile.in +++ b/dom/tests/mochitest/Makefile.in @@ -58,7 +58,6 @@ DIRS += \ sessionstorage \ storageevent \ pointerlock \ - w3c \ browser-frame \ $(NULL)