Bug 752202 - Shorten the paths to imported tests some more to hopefully fix C-C windows builds; rs=Standard8
authorMs2ger <ms2ger@gmail.com>
Sat, 05 May 2012 16:00:30 +0200
changeset 93264 0957b05585e9de738d05d54f89e02e46af512238
parent 93263 06f397d1f99724a8f83874b4091aa122dda94130
child 93265 79f78105c451afc837834ff39402a9daa8d6e80c
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs752202
milestone15.0a1
Bug 752202 - Shorten the paths to imported tests some more to hopefully fix C-C windows builds; rs=Standard8
dom/Makefile.in
dom/imported-tests/Makefile.in
dom/imported-tests/README
dom/imported-tests/WebIDLParser.js
dom/imported-tests/failures.txt
dom/imported-tests/html.json
dom/imported-tests/html.mk
dom/imported-tests/html.txt
dom/imported-tests/html/tests/submission/Mozilla/Makefile.in
dom/imported-tests/html/tests/submission/Mozilla/nested-document-write-external.js
dom/imported-tests/html/tests/submission/Mozilla/test_body-onload.html
dom/imported-tests/html/tests/submission/Mozilla/test_pageload-image.html
dom/imported-tests/html/tests/submission/Mozilla/test_pageload-video.html
dom/imported-tests/html/tests/submission/Mozilla/test_script-for-onload.html
dom/imported-tests/html/tests/submission/Mozilla/test_window-onerror-parse-error.html
dom/imported-tests/html/tests/submission/Mozilla/test_window-onerror-runtime-error-throw.html
dom/imported-tests/html/tests/submission/Mozilla/test_window-onerror-runtime-error.html
dom/imported-tests/idlharness.js
dom/imported-tests/importTestsuite.py
dom/imported-tests/parseManifest.py
dom/imported-tests/testharness.css
dom/imported-tests/testharness.js
dom/imported-tests/testharnessreport.js.in
dom/imported-tests/updateTestharness.py
dom/imported-tests/webapps.json
dom/imported-tests/webapps.mk
dom/imported-tests/webapps.txt
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/Makefile.in
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-01.htm
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-02.htm
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-03.htm
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-04.htm
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-05.htm
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-06.htm
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-07.htm
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-08.htm
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-09.htm
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-10.xml
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-11.xml
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-12.htm
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-13.htm
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-14.htm
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-15.htm
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-16.htm
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-17.htm
dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-18.htm
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_change_item_iframe.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_security_iframe.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_set_item_clear_iframe.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_set_item_iframe.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/session_change_item_iframe.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/session_set_item_clear_iframe.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/session_set_item_iframe.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_constructor.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_key.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_newvalue.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_oldvalue.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_storagearea.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_storageeventinit.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_url.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_key.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_newvalue.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_oldvalue.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_storagearea.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_storageeventinit.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_url.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_clear.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_getitem.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_key.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_length.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_removeitem.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_security.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_setitem.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_clear.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_getitem.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_key.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_length.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_removeitem.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_setitem.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Makefile.in
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_event_constructor_js.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_clear_js.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_getitem_js.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_in_js.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_index_js.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_length_js.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_removeitem_js.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_setitem_js.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_clear_js.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_getitem_js.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_in_js.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_index_js.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_length_js.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_removeitem_js.html
dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_setitem_js.html
dom/imported-tests/writeReporter.py
dom/imptests/Makefile.in
dom/imptests/README
dom/imptests/WebIDLParser.js
dom/imptests/failures.txt
dom/imptests/html.json
dom/imptests/html.mk
dom/imptests/html.txt
dom/imptests/html/tests/submission/Mozilla/Makefile.in
dom/imptests/html/tests/submission/Mozilla/nested-document-write-external.js
dom/imptests/html/tests/submission/Mozilla/test_body-onload.html
dom/imptests/html/tests/submission/Mozilla/test_pageload-image.html
dom/imptests/html/tests/submission/Mozilla/test_pageload-video.html
dom/imptests/html/tests/submission/Mozilla/test_script-for-onload.html
dom/imptests/html/tests/submission/Mozilla/test_window-onerror-parse-error.html
dom/imptests/html/tests/submission/Mozilla/test_window-onerror-runtime-error-throw.html
dom/imptests/html/tests/submission/Mozilla/test_window-onerror-runtime-error.html
dom/imptests/idlharness.js
dom/imptests/importTestsuite.py
dom/imptests/parseManifest.py
dom/imptests/testharness.css
dom/imptests/testharness.js
dom/imptests/testharnessreport.js.in
dom/imptests/updateTestharness.py
dom/imptests/webapps.json
dom/imptests/webapps.mk
dom/imptests/webapps.txt
dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-01.htm
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-02.htm
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-03.htm
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-04.htm
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-05.htm
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-06.htm
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-07.htm
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-08.htm
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-09.htm
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-10.xml
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-11.xml
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-12.htm
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-13.htm
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-14.htm
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-15.htm
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-16.htm
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-17.htm
dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-18.htm
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_change_item_iframe.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_security_iframe.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_set_item_clear_iframe.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_set_item_iframe.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/session_change_item_iframe.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/session_set_item_clear_iframe.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/session_set_item_iframe.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_constructor.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_key.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_newvalue.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_oldvalue.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_storagearea.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_storageeventinit.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_url.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_key.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_newvalue.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_oldvalue.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_storagearea.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_storageeventinit.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_url.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_clear.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_getitem.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_key.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_length.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_removeitem.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_security.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_setitem.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_clear.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_getitem.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_key.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_length.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_removeitem.html
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_setitem.html
dom/imptests/webapps/WebStorage/tests/submissions/Makefile.in
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_event_constructor_js.html
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_clear_js.html
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_getitem_js.html
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_in_js.html
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_index_js.html
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_length_js.html
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_removeitem_js.html
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_setitem_js.html
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_clear_js.html
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_getitem_js.html
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_in_js.html
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_index_js.html
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_length_js.html
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_removeitem_js.html
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_setitem_js.html
dom/imptests/writeReporter.py
--- a/dom/Makefile.in
+++ b/dom/Makefile.in
@@ -103,16 +103,16 @@ endif
 ifdef MOZ_B2G_BT
 DIRS += \
   bluetooth \
   $(NULL)
 endif
 
 TEST_DIRS += \
   tests \
-  imported-tests \
+  imptests \
   $(NULL)
 
 ifneq (,$(filter gtk2 cocoa windows android qt os2,$(MOZ_WIDGET_TOOLKIT)))
 TEST_DIRS += plugins/test
 endif
 
 include $(topsrcdir)/config/rules.mk
rename from dom/imported-tests/Makefile.in
rename to dom/imptests/Makefile.in
rename from dom/imported-tests/README
rename to dom/imptests/README
rename from dom/imported-tests/WebIDLParser.js
rename to dom/imptests/WebIDLParser.js
rename from dom/imported-tests/failures.txt
rename to dom/imptests/failures.txt
rename from dom/imported-tests/html.json
rename to dom/imptests/html.json
rename from dom/imported-tests/html.mk
rename to dom/imptests/html.mk
rename from dom/imported-tests/html.txt
rename to dom/imptests/html.txt
rename from dom/imported-tests/html/tests/submission/Mozilla/Makefile.in
rename to dom/imptests/html/tests/submission/Mozilla/Makefile.in
--- a/dom/imported-tests/html/tests/submission/Mozilla/Makefile.in
+++ b/dom/imptests/html/tests/submission/Mozilla/Makefile.in
@@ -1,16 +1,16 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
 DEPTH = ../../../../../..
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imported-tests/html/tests/submission/Mozilla
+relativesrcdir = dom/imptests/html/tests/submission/Mozilla
 
 DIRS = \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _TESTS = \
rename from dom/imported-tests/html/tests/submission/Mozilla/nested-document-write-external.js
rename to dom/imptests/html/tests/submission/Mozilla/nested-document-write-external.js
rename from dom/imported-tests/html/tests/submission/Mozilla/test_body-onload.html
rename to dom/imptests/html/tests/submission/Mozilla/test_body-onload.html
rename from dom/imported-tests/html/tests/submission/Mozilla/test_pageload-image.html
rename to dom/imptests/html/tests/submission/Mozilla/test_pageload-image.html
rename from dom/imported-tests/html/tests/submission/Mozilla/test_pageload-video.html
rename to dom/imptests/html/tests/submission/Mozilla/test_pageload-video.html
rename from dom/imported-tests/html/tests/submission/Mozilla/test_script-for-onload.html
rename to dom/imptests/html/tests/submission/Mozilla/test_script-for-onload.html
rename from dom/imported-tests/html/tests/submission/Mozilla/test_window-onerror-parse-error.html
rename to dom/imptests/html/tests/submission/Mozilla/test_window-onerror-parse-error.html
rename from dom/imported-tests/html/tests/submission/Mozilla/test_window-onerror-runtime-error-throw.html
rename to dom/imptests/html/tests/submission/Mozilla/test_window-onerror-runtime-error-throw.html
rename from dom/imported-tests/html/tests/submission/Mozilla/test_window-onerror-runtime-error.html
rename to dom/imptests/html/tests/submission/Mozilla/test_window-onerror-runtime-error.html
rename from dom/imported-tests/idlharness.js
rename to dom/imptests/idlharness.js
rename from dom/imported-tests/importTestsuite.py
rename to dom/imptests/importTestsuite.py
--- a/dom/imported-tests/importTestsuite.py
+++ b/dom/imptests/importTestsuite.py
@@ -169,9 +169,9 @@ def importRepo(confFile, thissrcdir):
     print e.returncode
   finally:
     print "Done"
 
 if __name__ == "__main__":
   if len(sys.argv) != 2:
     print "Need one argument."
   else:
-    importRepo(sys.argv[1], "dom/imported-tests")
+    importRepo(sys.argv[1], "dom/imptests")
rename from dom/imported-tests/parseManifest.py
rename to dom/imptests/parseManifest.py
rename from dom/imported-tests/testharness.css
rename to dom/imptests/testharness.css
rename from dom/imported-tests/testharness.js
rename to dom/imptests/testharness.js
rename from dom/imported-tests/testharnessreport.js.in
rename to dom/imptests/testharnessreport.js.in
--- a/dom/imported-tests/testharnessreport.js.in
+++ b/dom/imptests/testharnessreport.js.in
@@ -33,17 +33,17 @@ var W3CTest = {
     ["TEST-KNOWN-FAIL", "TEST-UNEXPECTED-PASS"]
   ],
 
   /**
    * Returns the URL of the current test, relative to the root W3C tests
    * directory. Used as a key into the expectedFailures dictionary.
    */
   "getURL": function() {
-    return this.runner.currentTestURL.substring("/tests/dom/imported-tests/".length);
+    return this.runner.currentTestURL.substring("/tests/dom/imptests/".length);
   },
 
   /**
    * Lets the test runner know about a test result.
    */
   "_log": function(test) {
     var msg = this.prefixes[+test.todo][+test.result] + " | ";
     if (this.runner.currentTestURL)
rename from dom/imported-tests/updateTestharness.py
rename to dom/imptests/updateTestharness.py
rename from dom/imported-tests/webapps.json
rename to dom/imptests/webapps.json
rename from dom/imported-tests/webapps.mk
rename to dom/imptests/webapps.mk
rename from dom/imported-tests/webapps.txt
rename to dom/imptests/webapps.txt
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/Makefile.in
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in
--- a/dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/Makefile.in
+++ b/dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in
@@ -1,16 +1,16 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
 DEPTH = ../../../../../../..
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imported-tests/webapps/DOMCore/tests/submissions/Opera
+relativesrcdir = dom/imptests/webapps/DOMCore/tests/submissions/Opera
 
 DIRS = \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _TESTS = \
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-01.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-01.htm
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-02.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-02.htm
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-03.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-03.htm
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-04.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-04.htm
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-05.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-05.htm
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-06.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-06.htm
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-07.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-07.htm
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-08.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-08.htm
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-09.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-09.htm
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-10.xml
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-10.xml
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-11.xml
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-11.xml
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-12.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-12.htm
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-13.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-13.htm
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-14.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-14.htm
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-15.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-15.htm
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-16.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-16.htm
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-17.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-17.htm
rename from dom/imported-tests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-18.htm
rename to dom/imptests/webapps/DOMCore/tests/submissions/Opera/test_getElementsByClassName-18.htm
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
--- a/dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
+++ b/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
@@ -1,16 +1,16 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
 DEPTH = ../../../../../../..
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware
+relativesrcdir = dom/imptests/webapps/WebStorage/tests/submissions/Infraware
 
 DIRS = \
   iframe \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in
--- a/dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in
+++ b/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in
@@ -1,16 +1,16 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
 DEPTH = ../../../../../../../..
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe
+relativesrcdir = dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe
 
 DIRS = \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _TESTS = \
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_change_item_iframe.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_change_item_iframe.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_security_iframe.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_security_iframe.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_set_item_clear_iframe.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_set_item_clear_iframe.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_set_item_iframe.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/local_set_item_iframe.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/session_change_item_iframe.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/session_change_item_iframe.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/session_set_item_clear_iframe.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/session_set_item_clear_iframe.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/iframe/session_set_item_iframe.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/session_set_item_iframe.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_constructor.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_constructor.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_key.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_key.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_newvalue.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_newvalue.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_oldvalue.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_oldvalue.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_storagearea.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_storagearea.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_storageeventinit.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_storageeventinit.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_url.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_local_url.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_key.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_key.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_newvalue.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_newvalue.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_oldvalue.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_oldvalue.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_storagearea.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_storagearea.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_storageeventinit.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_storageeventinit.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_url.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_event_session_url.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_clear.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_clear.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_getitem.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_getitem.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_key.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_key.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_length.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_length.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_removeitem.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_removeitem.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_security.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_security.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_setitem.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_setitem.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_clear.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_clear.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_getitem.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_getitem.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_key.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_key.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_length.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_length.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_removeitem.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_removeitem.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_setitem.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_session_setitem.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Makefile.in
rename to dom/imptests/webapps/WebStorage/tests/submissions/Makefile.in
--- a/dom/imported-tests/webapps/WebStorage/tests/submissions/Makefile.in
+++ b/dom/imptests/webapps/WebStorage/tests/submissions/Makefile.in
@@ -1,16 +1,16 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
 DEPTH = ../../../../../..
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imported-tests/webapps/WebStorage/tests/submissions
+relativesrcdir = dom/imptests/webapps/WebStorage/tests/submissions
 
 DIRS = \
   Infraware \
   Ms2ger \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
--- a/dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
+++ b/dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
@@ -1,16 +1,16 @@
 # THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
 
 DEPTH = ../../../../../../..
 
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-relativesrcdir = dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger
+relativesrcdir = dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger
 
 DIRS = \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _TESTS = \
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_event_constructor_js.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_event_constructor_js.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_clear_js.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_clear_js.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_getitem_js.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_getitem_js.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_in_js.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_in_js.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_index_js.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_index_js.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_length_js.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_length_js.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_removeitem_js.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_removeitem_js.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_setitem_js.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_local_setitem_js.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_clear_js.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_clear_js.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_getitem_js.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_getitem_js.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_in_js.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_in_js.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_index_js.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_index_js.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_length_js.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_length_js.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_removeitem_js.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_removeitem_js.html
rename from dom/imported-tests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_setitem_js.html
rename to dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/test_storage_session_setitem_js.html
rename from dom/imported-tests/writeReporter.py
rename to dom/imptests/writeReporter.py