Bug 924160 - Part a: Use mochitest manifests for the tests in dom/imptests; p=gps+Ms2ger r=Ms2ger+gps
authorGregory Szorc <gps@mozilla.com>
Mon, 07 Oct 2013 20:56:52 +0200
changeset 164239 b0f69426a5a2d4cfa226f8da9a6b04e8c81a41c0
parent 164238 1d238aec1c3b3c4ff7d39e1e80107e8430d4b9a7
child 164240 a4769f7058da469537cc627e21f6528d26de5e25
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersMs2ger
bugs924160
milestone29.0a1
Bug 924160 - Part a: Use mochitest manifests for the tests in dom/imptests; p=gps+Ms2ger r=Ms2ger+gps
dom/imptests/editing.mozbuild
dom/imptests/editing/Makefile.in
dom/imptests/editing/conformancetest/Makefile.in
dom/imptests/editing/conformancetest/moz.build
dom/imptests/editing/css/Makefile.in
dom/imptests/editing/css/moz.build
dom/imptests/editing/mochitest.ini
dom/imptests/editing/moz.build
dom/imptests/editing/selecttest/Makefile.in
dom/imptests/editing/selecttest/moz.build
dom/imptests/html.mozbuild
dom/imptests/html/dom/Makefile.in
dom/imptests/html/dom/collections/Makefile.in
dom/imptests/html/dom/collections/moz.build
dom/imptests/html/dom/errors/Makefile.in
dom/imptests/html/dom/errors/moz.build
dom/imptests/html/dom/events/Makefile.in
dom/imptests/html/dom/events/moz.build
dom/imptests/html/dom/lists/Makefile.in
dom/imptests/html/dom/lists/moz.build
dom/imptests/html/dom/moz.build
dom/imptests/html/dom/nodes/Document-createElement-namespace-tests/Makefile.in
dom/imptests/html/dom/nodes/Document-createElement-namespace-tests/moz.build
dom/imptests/html/dom/nodes/Makefile.in
dom/imptests/html/dom/nodes/moz.build
dom/imptests/html/dom/ranges/Makefile.in
dom/imptests/html/dom/ranges/moz.build
dom/imptests/html/dom/traversal/Makefile.in
dom/imptests/html/dom/traversal/moz.build
dom/imptests/html/dom/traversal/unfinished/Makefile.in
dom/imptests/html/dom/traversal/unfinished/moz.build
dom/imptests/html/domxpath/Makefile.in
dom/imptests/html/domxpath/moz.build
dom/imptests/html/html/browsers/browsing-the-web/read-media/Makefile.in
dom/imptests/html/html/browsers/browsing-the-web/read-media/moz.build
dom/imptests/html/html/browsers/the-window-object/Makefile.in
dom/imptests/html/html/browsers/the-window-object/moz.build
dom/imptests/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in
dom/imptests/html/html/browsers/the-window-object/named-access-on-the-window-object/moz.build
dom/imptests/html/html/dom/documents/dta/Makefile.in
dom/imptests/html/html/dom/documents/dta/doc.gEBN/Makefile.in
dom/imptests/html/html/dom/documents/dta/doc.gEBN/moz.build
dom/imptests/html/html/dom/documents/dta/moz.build
dom/imptests/html/html/dom/elements/global-attributes/Makefile.in
dom/imptests/html/html/dom/elements/global-attributes/moz.build
dom/imptests/html/html/editing/the-hidden-attribute/Makefile.in
dom/imptests/html/html/editing/the-hidden-attribute/moz.build
dom/imptests/html/html/obsolete/implreq/oeaaa/Makefile.in
dom/imptests/html/html/obsolete/implreq/oeaaa/moz.build
dom/imptests/html/html/semantics/document-metadata/the-title-element/Makefile.in
dom/imptests/html/html/semantics/document-metadata/the-title-element/moz.build
dom/imptests/html/html/semantics/forms/the-form-element/Makefile.in
dom/imptests/html/html/semantics/forms/the-form-element/moz.build
dom/imptests/html/html/semantics/forms/the-option-element/Makefile.in
dom/imptests/html/html/semantics/forms/the-option-element/moz.build
dom/imptests/html/html/semantics/forms/the-select-element/Makefile.in
dom/imptests/html/html/semantics/forms/the-select-element/moz.build
dom/imptests/html/html/semantics/scripting-1/the-script-element/Makefile.in
dom/imptests/html/html/semantics/scripting-1/the-script-element/moz.build
dom/imptests/html/html/semantics/tabular-data/the-table-element/Makefile.in
dom/imptests/html/html/semantics/tabular-data/the-table-element/moz.build
dom/imptests/html/html/semantics/text-level-semantics/the-time-element/Makefile.in
dom/imptests/html/html/semantics/text-level-semantics/the-time-element/moz.build
dom/imptests/html/html/webappapis/atob/Makefile.in
dom/imptests/html/html/webappapis/atob/moz.build
dom/imptests/html/html/webappapis/scripting/events/Makefile.in
dom/imptests/html/html/webappapis/scripting/events/moz.build
dom/imptests/html/html/webappapis/scripting/processing-model-2/Makefile.in
dom/imptests/html/html/webappapis/scripting/processing-model-2/moz.build
dom/imptests/html/html/webappapis/timers/Makefile.in
dom/imptests/html/html/webappapis/timers/moz.build
dom/imptests/html/js/builtins/Makefile.in
dom/imptests/html/js/builtins/moz.build
dom/imptests/html/microdata/microdata-dom-api/Makefile.in
dom/imptests/html/microdata/microdata-dom-api/moz.build
dom/imptests/html/mochitest.ini
dom/imptests/html/typedarrays/Makefile.in
dom/imptests/html/typedarrays/moz.build
dom/imptests/html/webgl/Makefile.in
dom/imptests/html/webgl/moz.build
dom/imptests/importTestsuite.py
dom/imptests/moz.build
dom/imptests/webapps.mozbuild
dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in
dom/imptests/webapps/DOMCore/tests/submissions/Opera/Makefile.in
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/moz.build
dom/imptests/webapps/WebStorage/tests/submissions/Infraware/moz.build
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/moz.build
dom/imptests/webapps/WebStorage/tests/submissions/moz.build
dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/moz.build
dom/imptests/webapps/mochitest.ini
dom/imptests/writeBuildFiles.py
deleted file mode 100644
--- a/dom/imptests/editing.mozbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-    'editing',
-]
deleted file mode 100644
--- a/dom/imptests/editing/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  implementation.js \
-  tests.js \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/editing/conformancetest/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_runtest.html \
-  test_event.html \
-  data.js \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/editing/conformancetest/moz.build
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/editing/css/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  reset.css \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/editing/css/moz.build
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
new file mode 100644
--- /dev/null
+++ b/dom/imptests/editing/mochitest.ini
@@ -0,0 +1,24 @@
+# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+  conformancetest/data.js
+  css/reset.css
+  implementation.js
+  selecttest/common.js
+  selecttest/test-iframe.html
+  tests.js
+
+[conformancetest/test_event.html]
+[conformancetest/test_runtest.html]
+[selecttest/test_Document-open.html]
+[selecttest/test_addRange.html]
+[selecttest/test_collapse.html]
+[selecttest/test_collapseToStartEnd.html]
+[selecttest/test_deleteFromDocument.html]
+[selecttest/test_extend.html]
+[selecttest/test_getRangeAt.html]
+[selecttest/test_getSelection.html]
+[selecttest/test_interfaces.html]
+[selecttest/test_isCollapsed.html]
+[selecttest/test_removeAllRanges.html]
+[selecttest/test_selectAllChildren.html]
deleted file mode 100644
--- a/dom/imptests/editing/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-    'css',
-    'conformancetest',
-    'selecttest',
-]
deleted file mode 100644
--- a/dom/imptests/editing/selecttest/Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_addRange.html \
-  test_collapse.html \
-  test_collapseToStartEnd.html \
-  test_deleteFromDocument.html \
-  test_Document-open.html \
-  test_extend.html \
-  test_getRangeAt.html \
-  test_getSelection.html \
-  test_interfaces.html \
-  test_isCollapsed.html \
-  test_removeAllRanges.html \
-  test_selectAllChildren.html \
-  common.js \
-  test-iframe.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/editing/selecttest/moz.build
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html.mozbuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-    'html/dom',
-    'html/dom/collections',
-    'html/dom/errors',
-    'html/dom/events',
-    'html/dom/lists',
-    'html/dom/nodes',
-    'html/dom/nodes/Document-createElement-namespace-tests',
-    'html/dom/ranges',
-    'html/dom/traversal',
-    'html/dom/traversal/unfinished',
-    'html/domxpath',
-    'html/html/browsers/browsing-the-web/read-media',
-    'html/html/browsers/the-window-object',
-    'html/html/browsers/the-window-object/named-access-on-the-window-object',
-    'html/html/dom/documents/dta',
-    'html/html/dom/documents/dta/doc.gEBN',
-    'html/html/dom/elements/global-attributes',
-    'html/html/editing/the-hidden-attribute',
-    'html/html/obsolete/implreq/oeaaa',
-    'html/html/semantics/document-metadata/the-title-element',
-    'html/html/semantics/forms/the-form-element',
-    'html/html/semantics/forms/the-option-element',
-    'html/html/semantics/forms/the-select-element',
-    'html/html/semantics/scripting-1/the-script-element',
-    'html/html/semantics/tabular-data/the-table-element',
-    'html/html/semantics/text-level-semantics/the-time-element',
-    'html/html/webappapis/atob',
-    'html/html/webappapis/scripting/events',
-    'html/html/webappapis/scripting/processing-model-2',
-    'html/html/webappapis/timers',
-    'html/js/builtins',
-    'html/microdata/microdata-dom-api',
-    'html/typedarrays',
-    'html/webgl',
-]
deleted file mode 100644
--- a/dom/imptests/html/dom/Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_historical.html \
-  test_interface-objects.html \
-  test_interfaces.html \
-  common.js \
-  constants.js \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/dom/collections/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_HTMLCollection-empty-name.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/dom/collections/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/dom/errors/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_DOMException-constants.html \
-  test_exceptions.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/dom/errors/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/dom/events/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_Event-constants.html \
-  test_Event-constructors.html \
-  test_Event-defaultPrevented.html \
-  test_Event-initEvent.html \
-  test_Event-propagation.html \
-  test_EventTarget-addEventListener.html \
-  test_EventTarget-dispatchEvent.html \
-  test_EventTarget-removeEventListener.html \
-  test_Event-type.html \
-  test_ProgressEvent.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/dom/events/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/dom/lists/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_DOMTokenList-stringifier.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/dom/lists/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/dom/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/dom/nodes/Document-createElement-namespace-tests/Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  bare_mathml.html \
-  bare_mathml.svg \
-  bare_mathml.xhtml \
-  bare_mathml.xml \
-  bare_svg.html \
-  bare_svg.svg \
-  bare_svg.xhtml \
-  bare_svg.xml \
-  bare_xhtml.html \
-  bare_xhtml.svg \
-  bare_xhtml.xhtml \
-  bare_xhtml.xml \
-  empty.html \
-  empty.svg \
-  empty.xhtml \
-  empty.xml \
-  generate.py \
-  mathml.html \
-  mathml.svg \
-  mathml.xhtml \
-  mathml.xml \
-  minimal_html.html \
-  minimal_html.svg \
-  minimal_html.xhtml \
-  minimal_html.xml \
-  svg.html \
-  svg.svg \
-  svg.xhtml \
-  svg.xml \
-  xhtml.html \
-  xhtml_ns_changed.html \
-  xhtml_ns_changed.svg \
-  xhtml_ns_changed.xhtml \
-  xhtml_ns_changed.xml \
-  xhtml_ns_removed.html \
-  xhtml_ns_removed.svg \
-  xhtml_ns_removed.xhtml \
-  xhtml_ns_removed.xml \
-  xhtml.svg \
-  xhtml.xhtml \
-  xhtml.xml \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/dom/nodes/Document-createElement-namespace-tests/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/dom/nodes/Makefile.in
+++ /dev/null
@@ -1,79 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_attributes.html \
-  test_case.html \
-  test_CharacterData-appendData.html \
-  test_CharacterData-deleteData.html \
-  test_CharacterData-insertData.html \
-  test_CharacterData-remove.html \
-  test_CharacterData-replaceData.html \
-  test_Comment-constructor.html \
-  test_Document-adoptNode.html \
-  test_Document-createComment.html \
-  test_Document-createElement.html \
-  test_Document-createElement-namespace.html \
-  test_Document-createElementNS.html \
-  test_Document-createEvent.html \
-  test_Document-createProcessingInstruction.html \
-  test_Document-createProcessingInstruction-literal-1.xhtml \
-  test_Document-createProcessingInstruction-literal-2.xhtml \
-  test_Document-createProcessingInstruction.xhtml \
-  test_Document-createTreeWalker.html \
-  test_Document-getElementById.html \
-  test_Document-getElementsByTagName.html \
-  test_Document-getElementsByTagNameNS.html \
-  test_Document-importNode.html \
-  test_DocumentType-remove.html \
-  test_DOMImplementation-createDocument.html \
-  test_DOMImplementation-createDocumentType.html \
-  test_DOMImplementation-createHTMLDocument.html \
-  test_DOMImplementation-hasFeature.html \
-  test_Element-children.html \
-  test_Element-getElementsByClassName.html \
-  test_Element-removeAttributeNS.html \
-  test_Element-remove.html \
-  test_Element-tagName.html \
-  test_getElementsByClassName-01.htm \
-  test_getElementsByClassName-02.htm \
-  test_getElementsByClassName-03.htm \
-  test_getElementsByClassName-04.htm \
-  test_getElementsByClassName-05.htm \
-  test_getElementsByClassName-06.htm \
-  test_getElementsByClassName-07.htm \
-  test_getElementsByClassName-08.htm \
-  test_getElementsByClassName-09.htm \
-  test_getElementsByClassName-10.xml \
-  test_getElementsByClassName-11.xml \
-  test_getElementsByClassName-12.htm \
-  test_getElementsByClassName-13.htm \
-  test_getElementsByClassName-14.htm \
-  test_getElementsByClassName-15.htm \
-  test_getElementsByClassName-16.htm \
-  test_getElementsByClassName-17.htm \
-  test_getElementsByClassName-18.htm \
-  test_Node-appendChild.html \
-  test_Node-cloneNode.html \
-  test_Node-compareDocumentPosition.html \
-  test_Node-constants.html \
-  test_Node-contains.html \
-  test_Node-contains.xml \
-  test_Node-insertBefore.html \
-  test_Node-isEqualNode.xhtml \
-  test_Node-lookupPrefix.xhtml \
-  test_Node-nodeName.html \
-  test_Node-nodeName.xhtml \
-  test_Node-normalize.html \
-  test_Node-parentElement.html \
-  test_Node-parentNode.html \
-  test_Node-properties.html \
-  test_Node-removeChild.html \
-  test_Node-replaceChild.html \
-  attributes.js \
-  case.js \
-  ChildNode-remove.js \
-  creators.js \
-  Document-createProcessingInstruction.js \
-  encoding.php \
-  productions.js \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/dom/nodes/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/dom/ranges/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_Range-attributes.html \
-  test_Range-cloneContents.html \
-  test_Range-cloneRange.html \
-  test_Range-collapse.html \
-  test_Range-commonAncestorContainer-2.html \
-  test_Range-commonAncestorContainer.html \
-  test_Range-compareBoundaryPoints.html \
-  test_Range-comparePoint-2.html \
-  test_Range-comparePoint.html \
-  test_Range-deleteContents.html \
-  test_Range-detach.html \
-  test_Range-extractContents.html \
-  test_Range-insertNode.html \
-  test_Range-intersectsNode-binding.html \
-  test_Range-intersectsNode.html \
-  test_Range-isPointInRange.html \
-  test_Range-mutations.html \
-  test_Range-selectNode.html \
-  test_Range-set.html \
-  test_Range-surroundContents.html \
-  Range-test-iframe.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/dom/ranges/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/dom/traversal/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_NodeFilter-constants.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/dom/traversal/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/dom/traversal/unfinished/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  TODO \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/dom/traversal/unfinished/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/domxpath/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_evaluator-constructor.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/domxpath/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/browsers/browsing-the-web/read-media/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_pageload-image.html \
-  test_pageload-video.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/browsers/browsing-the-web/read-media/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/browsers/the-window-object/Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-# Disabled due to bug 859075
-#  test_window-named-properties.html \
-
-MOCHITEST_FILES := \
-  test_window-indexed-properties.html \
-  test_window-indexed-properties-strict.html \
-  test_window-properties.html \
-  test_window-prototype-chain.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/browsers/the-window-object/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_window-null-names.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/browsers/the-window-object/named-access-on-the-window-object/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/dom/documents/dta/Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_document.body-getter.html \
-  test_document.body-setter-01.html \
-  test_document.embeds-document.plugins-01.html \
-  test_Document.getElementsByClassName-null-undef.html \
-  test_document.getElementsByClassName-same.html \
-  test_document.head-01.html \
-  test_document.head-02.html \
-  test_document.images.html \
-  test_document.title-01.html \
-  test_document.title-02.xhtml \
-  test_document.title-03.html \
-  test_document.title-04.xhtml \
-  test_document.title-05.html \
-  test_document.title-06.html \
-  test_document.title-07.html \
-  test_Element.getElementsByClassName-null-undef.html \
-  test_nameditem-01.html \
-  test_nameditem-02.html \
-  test_nameditem-03.html \
-  test_nameditem-04.html \
-  test_nameditem-05.html \
-  test_nameditem-06.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/dom/documents/dta/doc.gEBN/Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_document.getElementsByName-case.html \
-  test_document.getElementsByName-case.xhtml \
-  test_document.getElementsByName-id.html \
-  test_document.getElementsByName-id.xhtml \
-  test_document.getElementsByName-namespace.html \
-  test_document.getElementsByName-namespace.xhtml \
-  test_document.getElementsByName-newelements.html \
-  test_document.getElementsByName-newelements.xhtml \
-  test_document.getElementsByName-null-undef.html \
-  test_document.getElementsByName-null-undef.xhtml \
-  test_document.getElementsByName-param.html \
-  test_document.getElementsByName-param.xhtml \
-  test_document.getElementsByName-same.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/dom/documents/dta/doc.gEBN/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/dom/documents/dta/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/dom/elements/global-attributes/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_classlist-nonstring.html \
-  test_dataset-delete.html \
-  test_dataset-enumeration.html \
-  test_dataset-get.html \
-  test_dataset.html \
-  test_dataset-prototype.html \
-  test_dataset-set.html \
-  test_document-dir.html \
-  test_id-attribute.html \
-  test_id-name.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/dom/elements/global-attributes/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/editing/the-hidden-attribute/Makefile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-
deleted file mode 100644
--- a/dom/imptests/html/html/editing/the-hidden-attribute/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/obsolete/implreq/oeaaa/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_document-color-01.html \
-  test_document-color-02.html \
-  test_document-color-03.html \
-  test_document-color-04.html \
-  test_heading-obsolete-attributes-01.html \
-  test_script-IDL-event-htmlfor.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/obsolete/implreq/oeaaa/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/semantics/document-metadata/the-title-element/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_title.text-01.html \
-  test_title.text-02.xhtml \
-  test_title.text-03.html \
-  test_title.text-04.xhtml \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/semantics/document-metadata/the-title-element/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/semantics/forms/the-form-element/Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_form-elements-interfaces-01.html \
-  test_form-elements-matches.html \
-  test_form-elements-nameditem-01.html \
-  test_form-elements-nameditem-02.html \
-  test_form-nameditem.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/semantics/forms/the-form-element/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/semantics/forms/the-option-element/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_option-text-backslash.html \
-  test_option-text-recurse.html \
-  test_option-text-spaces.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/semantics/forms/the-option-element/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/semantics/forms/the-select-element/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_select-named-getter.html \
-  test_select-remove.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/semantics/forms/the-select-element/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/semantics/scripting-1/the-script-element/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_script-for-event.html \
-  test_script-for-onload.html \
-  test_script-for-event.xhtml \
-  test_script-language-type.html \
-  test_script-languages-01.html \
-  test_script-languages-02.html \
-  test_script-noembed-noframes-iframe.xhtml \
-  test_script-onload-string.html \
-  test_script-text.html \
-  test_script-text.xhtml \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/semantics/scripting-1/the-script-element/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/semantics/tabular-data/the-table-element/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_createTBody.html \
-  test_insertRow-method-01.html \
-  test_insertRow-method-02.html \
-  test_table-insertRow.html \
-  test_table-rows.html \
-  test_tBodies.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/semantics/tabular-data/the-table-element/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/semantics/text-level-semantics/the-time-element/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_001.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/semantics/text-level-semantics/the-time-element/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/webappapis/atob/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_base64.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/webappapis/atob/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/webappapis/scripting/events/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_body-onload.html \
-  test_event-handler-javascript.html \
-  test_event-handler-spec-example.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/webappapis/scripting/events/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/webappapis/scripting/processing-model-2/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_window-onerror-parse-error.html \
-  test_window-onerror-runtime-error.html \
-  test_window-onerror-runtime-error-throw.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/webappapis/scripting/processing-model-2/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/html/webappapis/timers/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_evil-spec-example.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/html/webappapis/timers/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/js/builtins/Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_Array.DefineOwnProperty.html \
-  test_Array.prototype.join-order.html \
-  test_Math.max.html \
-  test_Math.min.html \
-  test_Object.prototype.hasOwnProperty-order.html \
-  test_WeakMap.prototype-properties.html \
-  Math.maxmin.js \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/js/builtins/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/microdata/microdata-dom-api/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_001.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/microdata/microdata-dom-api/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
new file mode 100644
--- /dev/null
+++ b/dom/imptests/html/mochitest.ini
@@ -0,0 +1,278 @@
+# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+  dom/common.js
+  dom/constants.js
+  dom/nodes/ChildNode-remove.js
+  dom/nodes/Document-createElement-namespace-tests/bare_mathml.html
+  dom/nodes/Document-createElement-namespace-tests/bare_mathml.svg
+  dom/nodes/Document-createElement-namespace-tests/bare_mathml.xhtml
+  dom/nodes/Document-createElement-namespace-tests/bare_mathml.xml
+  dom/nodes/Document-createElement-namespace-tests/bare_svg.html
+  dom/nodes/Document-createElement-namespace-tests/bare_svg.svg
+  dom/nodes/Document-createElement-namespace-tests/bare_svg.xhtml
+  dom/nodes/Document-createElement-namespace-tests/bare_svg.xml
+  dom/nodes/Document-createElement-namespace-tests/bare_xhtml.html
+  dom/nodes/Document-createElement-namespace-tests/bare_xhtml.svg
+  dom/nodes/Document-createElement-namespace-tests/bare_xhtml.xhtml
+  dom/nodes/Document-createElement-namespace-tests/bare_xhtml.xml
+  dom/nodes/Document-createElement-namespace-tests/empty.html
+  dom/nodes/Document-createElement-namespace-tests/empty.svg
+  dom/nodes/Document-createElement-namespace-tests/empty.xhtml
+  dom/nodes/Document-createElement-namespace-tests/empty.xml
+  dom/nodes/Document-createElement-namespace-tests/generate.py
+  dom/nodes/Document-createElement-namespace-tests/mathml.html
+  dom/nodes/Document-createElement-namespace-tests/mathml.svg
+  dom/nodes/Document-createElement-namespace-tests/mathml.xhtml
+  dom/nodes/Document-createElement-namespace-tests/mathml.xml
+  dom/nodes/Document-createElement-namespace-tests/minimal_html.html
+  dom/nodes/Document-createElement-namespace-tests/minimal_html.svg
+  dom/nodes/Document-createElement-namespace-tests/minimal_html.xhtml
+  dom/nodes/Document-createElement-namespace-tests/minimal_html.xml
+  dom/nodes/Document-createElement-namespace-tests/svg.html
+  dom/nodes/Document-createElement-namespace-tests/svg.svg
+  dom/nodes/Document-createElement-namespace-tests/svg.xhtml
+  dom/nodes/Document-createElement-namespace-tests/svg.xml
+  dom/nodes/Document-createElement-namespace-tests/xhtml.html
+  dom/nodes/Document-createElement-namespace-tests/xhtml.svg
+  dom/nodes/Document-createElement-namespace-tests/xhtml.xhtml
+  dom/nodes/Document-createElement-namespace-tests/xhtml.xml
+  dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.html
+  dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.svg
+  dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.xhtml
+  dom/nodes/Document-createElement-namespace-tests/xhtml_ns_changed.xml
+  dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.html
+  dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.svg
+  dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.xhtml
+  dom/nodes/Document-createElement-namespace-tests/xhtml_ns_removed.xml
+  dom/nodes/Document-createProcessingInstruction.js
+  dom/nodes/attributes.js
+  dom/nodes/case.js
+  dom/nodes/creators.js
+  dom/nodes/encoding.php
+  dom/nodes/productions.js
+  dom/ranges/Range-test-iframe.html
+  dom/traversal/unfinished/TODO
+  js/builtins/Math.maxmin.js
+  webgl/common.js
+
+[dom/collections/test_HTMLCollection-empty-name.html]
+[dom/errors/test_DOMException-constants.html]
+[dom/errors/test_exceptions.html]
+[dom/events/test_Event-constants.html]
+[dom/events/test_Event-constructors.html]
+[dom/events/test_Event-defaultPrevented.html]
+[dom/events/test_Event-initEvent.html]
+[dom/events/test_Event-propagation.html]
+[dom/events/test_Event-type.html]
+[dom/events/test_EventTarget-addEventListener.html]
+[dom/events/test_EventTarget-dispatchEvent.html]
+[dom/events/test_EventTarget-removeEventListener.html]
+[dom/events/test_ProgressEvent.html]
+[dom/lists/test_DOMTokenList-stringifier.html]
+[dom/nodes/test_CharacterData-appendData.html]
+[dom/nodes/test_CharacterData-deleteData.html]
+[dom/nodes/test_CharacterData-insertData.html]
+[dom/nodes/test_CharacterData-remove.html]
+[dom/nodes/test_CharacterData-replaceData.html]
+[dom/nodes/test_Comment-constructor.html]
+[dom/nodes/test_DOMImplementation-createDocument.html]
+[dom/nodes/test_DOMImplementation-createDocumentType.html]
+[dom/nodes/test_DOMImplementation-createHTMLDocument.html]
+[dom/nodes/test_DOMImplementation-hasFeature.html]
+[dom/nodes/test_Document-adoptNode.html]
+[dom/nodes/test_Document-createComment.html]
+[dom/nodes/test_Document-createElement-namespace.html]
+[dom/nodes/test_Document-createElement.html]
+[dom/nodes/test_Document-createElementNS.html]
+[dom/nodes/test_Document-createEvent.html]
+[dom/nodes/test_Document-createProcessingInstruction-literal-1.xhtml]
+[dom/nodes/test_Document-createProcessingInstruction-literal-2.xhtml]
+[dom/nodes/test_Document-createProcessingInstruction.html]
+[dom/nodes/test_Document-createProcessingInstruction.xhtml]
+[dom/nodes/test_Document-createTreeWalker.html]
+[dom/nodes/test_Document-getElementById.html]
+[dom/nodes/test_Document-getElementsByTagName.html]
+[dom/nodes/test_Document-getElementsByTagNameNS.html]
+[dom/nodes/test_Document-importNode.html]
+[dom/nodes/test_DocumentType-remove.html]
+[dom/nodes/test_Element-children.html]
+[dom/nodes/test_Element-getElementsByClassName.html]
+[dom/nodes/test_Element-remove.html]
+[dom/nodes/test_Element-removeAttributeNS.html]
+[dom/nodes/test_Element-tagName.html]
+[dom/nodes/test_Node-appendChild.html]
+[dom/nodes/test_Node-cloneNode.html]
+[dom/nodes/test_Node-compareDocumentPosition.html]
+[dom/nodes/test_Node-constants.html]
+[dom/nodes/test_Node-contains.html]
+[dom/nodes/test_Node-contains.xml]
+[dom/nodes/test_Node-insertBefore.html]
+[dom/nodes/test_Node-isEqualNode.xhtml]
+[dom/nodes/test_Node-lookupPrefix.xhtml]
+[dom/nodes/test_Node-nodeName.html]
+[dom/nodes/test_Node-nodeName.xhtml]
+[dom/nodes/test_Node-normalize.html]
+[dom/nodes/test_Node-parentElement.html]
+[dom/nodes/test_Node-parentNode.html]
+[dom/nodes/test_Node-properties.html]
+[dom/nodes/test_Node-removeChild.html]
+[dom/nodes/test_Node-replaceChild.html]
+[dom/nodes/test_attributes.html]
+[dom/nodes/test_case.html]
+[dom/nodes/test_getElementsByClassName-01.htm]
+[dom/nodes/test_getElementsByClassName-02.htm]
+[dom/nodes/test_getElementsByClassName-03.htm]
+[dom/nodes/test_getElementsByClassName-04.htm]
+[dom/nodes/test_getElementsByClassName-05.htm]
+[dom/nodes/test_getElementsByClassName-06.htm]
+[dom/nodes/test_getElementsByClassName-07.htm]
+[dom/nodes/test_getElementsByClassName-08.htm]
+[dom/nodes/test_getElementsByClassName-09.htm]
+[dom/nodes/test_getElementsByClassName-10.xml]
+[dom/nodes/test_getElementsByClassName-11.xml]
+[dom/nodes/test_getElementsByClassName-12.htm]
+[dom/nodes/test_getElementsByClassName-13.htm]
+[dom/nodes/test_getElementsByClassName-14.htm]
+[dom/nodes/test_getElementsByClassName-15.htm]
+[dom/nodes/test_getElementsByClassName-16.htm]
+[dom/nodes/test_getElementsByClassName-17.htm]
+[dom/nodes/test_getElementsByClassName-18.htm]
+[dom/ranges/test_Range-attributes.html]
+[dom/ranges/test_Range-cloneContents.html]
+[dom/ranges/test_Range-cloneRange.html]
+[dom/ranges/test_Range-collapse.html]
+[dom/ranges/test_Range-commonAncestorContainer-2.html]
+[dom/ranges/test_Range-commonAncestorContainer.html]
+[dom/ranges/test_Range-compareBoundaryPoints.html]
+[dom/ranges/test_Range-comparePoint-2.html]
+[dom/ranges/test_Range-comparePoint.html]
+[dom/ranges/test_Range-deleteContents.html]
+[dom/ranges/test_Range-detach.html]
+[dom/ranges/test_Range-extractContents.html]
+[dom/ranges/test_Range-insertNode.html]
+[dom/ranges/test_Range-intersectsNode-binding.html]
+[dom/ranges/test_Range-intersectsNode.html]
+[dom/ranges/test_Range-isPointInRange.html]
+[dom/ranges/test_Range-mutations.html]
+[dom/ranges/test_Range-selectNode.html]
+[dom/ranges/test_Range-set.html]
+[dom/ranges/test_Range-surroundContents.html]
+[dom/test_historical.html]
+[dom/test_interface-objects.html]
+[dom/test_interfaces.html]
+[dom/traversal/test_NodeFilter-constants.html]
+[domxpath/test_evaluator-constructor.html]
+[html/browsers/browsing-the-web/read-media/test_pageload-image.html]
+[html/browsers/browsing-the-web/read-media/test_pageload-video.html]
+[html/browsers/the-window-object/named-access-on-the-window-object/test_window-null-names.html]
+[html/browsers/the-window-object/test_window-indexed-properties-strict.html]
+[html/browsers/the-window-object/test_window-indexed-properties.html]
+[html/browsers/the-window-object/test_window-named-properties.html]
+skip-if = true # bug 859075
+[html/browsers/the-window-object/test_window-properties.html]
+[html/browsers/the-window-object/test_window-prototype-chain.html]
+[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-case.html]
+[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-case.xhtml]
+[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-id.html]
+[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-id.xhtml]
+[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-namespace.html]
+[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-namespace.xhtml]
+[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-newelements.html]
+[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-newelements.xhtml]
+[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-null-undef.html]
+[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-null-undef.xhtml]
+[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-param.html]
+[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-param.xhtml]
+[html/dom/documents/dom-tree-accessors/document.getElementsByName/test_document.getElementsByName-same.html]
+[html/dom/documents/dom-tree-accessors/test_Document.getElementsByClassName-null-undef.html]
+[html/dom/documents/dom-tree-accessors/test_Element.getElementsByClassName-null-undef.html]
+[html/dom/documents/dom-tree-accessors/test_document.body-getter.html]
+[html/dom/documents/dom-tree-accessors/test_document.body-setter-01.html]
+[html/dom/documents/dom-tree-accessors/test_document.embeds-document.plugins-01.html]
+[html/dom/documents/dom-tree-accessors/test_document.getElementsByClassName-same.html]
+[html/dom/documents/dom-tree-accessors/test_document.head-01.html]
+[html/dom/documents/dom-tree-accessors/test_document.head-02.html]
+[html/dom/documents/dom-tree-accessors/test_document.images.html]
+[html/dom/documents/dom-tree-accessors/test_document.title-01.html]
+[html/dom/documents/dom-tree-accessors/test_document.title-02.xhtml]
+[html/dom/documents/dom-tree-accessors/test_document.title-03.html]
+[html/dom/documents/dom-tree-accessors/test_document.title-04.xhtml]
+[html/dom/documents/dom-tree-accessors/test_document.title-05.html]
+[html/dom/documents/dom-tree-accessors/test_document.title-06.html]
+[html/dom/documents/dom-tree-accessors/test_document.title-07.html]
+[html/dom/documents/dom-tree-accessors/test_nameditem-01.html]
+[html/dom/documents/dom-tree-accessors/test_nameditem-02.html]
+[html/dom/documents/dom-tree-accessors/test_nameditem-03.html]
+[html/dom/documents/dom-tree-accessors/test_nameditem-04.html]
+[html/dom/documents/dom-tree-accessors/test_nameditem-05.html]
+[html/dom/documents/dom-tree-accessors/test_nameditem-06.html]
+[html/dom/elements/global-attributes/test_classlist-nonstring.html]
+[html/dom/elements/global-attributes/test_dataset-delete.html]
+[html/dom/elements/global-attributes/test_dataset-enumeration.html]
+[html/dom/elements/global-attributes/test_dataset-get.html]
+[html/dom/elements/global-attributes/test_dataset-prototype.html]
+[html/dom/elements/global-attributes/test_dataset-set.html]
+[html/dom/elements/global-attributes/test_dataset.html]
+[html/dom/elements/global-attributes/test_document-dir.html]
+[html/dom/elements/global-attributes/test_id-attribute.html]
+[html/dom/elements/global-attributes/test_id-name.html]
+[html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-01.html]
+[html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-02.html]
+[html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-03.html]
+[html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_document-color-04.html]
+[html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_heading-obsolete-attributes-01.html]
+[html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/test_script-IDL-event-htmlfor.html]
+[html/semantics/document-metadata/the-title-element/test_title.text-01.html]
+[html/semantics/document-metadata/the-title-element/test_title.text-02.xhtml]
+[html/semantics/document-metadata/the-title-element/test_title.text-03.html]
+[html/semantics/document-metadata/the-title-element/test_title.text-04.xhtml]
+[html/semantics/forms/the-form-element/test_form-elements-interfaces-01.html]
+[html/semantics/forms/the-form-element/test_form-elements-matches.html]
+[html/semantics/forms/the-form-element/test_form-elements-nameditem-01.html]
+[html/semantics/forms/the-form-element/test_form-elements-nameditem-02.html]
+[html/semantics/forms/the-form-element/test_form-nameditem.html]
+[html/semantics/forms/the-option-element/test_option-text-backslash.html]
+[html/semantics/forms/the-option-element/test_option-text-recurse.html]
+[html/semantics/forms/the-option-element/test_option-text-spaces.html]
+[html/semantics/forms/the-select-element/test_select-named-getter.html]
+[html/semantics/forms/the-select-element/test_select-remove.html]
+[html/semantics/scripting-1/the-script-element/test_script-for-event.html]
+[html/semantics/scripting-1/the-script-element/test_script-for-event.xhtml]
+[html/semantics/scripting-1/the-script-element/test_script-for-onload.html]
+[html/semantics/scripting-1/the-script-element/test_script-language-type.html]
+[html/semantics/scripting-1/the-script-element/test_script-languages-01.html]
+[html/semantics/scripting-1/the-script-element/test_script-languages-02.html]
+[html/semantics/scripting-1/the-script-element/test_script-noembed-noframes-iframe.xhtml]
+[html/semantics/scripting-1/the-script-element/test_script-onload-string.html]
+[html/semantics/scripting-1/the-script-element/test_script-text.html]
+[html/semantics/scripting-1/the-script-element/test_script-text.xhtml]
+[html/semantics/tabular-data/the-table-element/test_createTBody.html]
+[html/semantics/tabular-data/the-table-element/test_insertRow-method-01.html]
+[html/semantics/tabular-data/the-table-element/test_insertRow-method-02.html]
+[html/semantics/tabular-data/the-table-element/test_tBodies.html]
+[html/semantics/tabular-data/the-table-element/test_table-insertRow.html]
+[html/semantics/tabular-data/the-table-element/test_table-rows.html]
+[html/semantics/text-level-semantics/the-time-element/test_001.html]
+[html/webappapis/atob/test_base64.html]
+[html/webappapis/scripting/events/test_body-onload.html]
+[html/webappapis/scripting/events/test_event-handler-javascript.html]
+[html/webappapis/scripting/events/test_event-handler-spec-example.html]
+[html/webappapis/scripting/processing-model-2/test_window-onerror-parse-error.html]
+[html/webappapis/scripting/processing-model-2/test_window-onerror-runtime-error-throw.html]
+[html/webappapis/scripting/processing-model-2/test_window-onerror-runtime-error.html]
+[html/webappapis/timers/test_evil-spec-example.html]
+[js/builtins/test_Array.DefineOwnProperty.html]
+[js/builtins/test_Array.prototype.join-order.html]
+[js/builtins/test_Math.max.html]
+[js/builtins/test_Math.min.html]
+[js/builtins/test_Object.prototype.hasOwnProperty-order.html]
+[js/builtins/test_WeakMap.prototype-properties.html]
+[microdata/microdata-dom-api/test_001.html]
+[typedarrays/test_constructors.html]
+[webgl/test_bufferSubData.html]
+[webgl/test_compressedTexImage2D.html]
+[webgl/test_compressedTexSubImage2D.html]
+[webgl/test_texImage2D.html]
+[webgl/test_texSubImage2D.html]
+[webgl/test_uniformMatrixNfv.html]
deleted file mode 100644
--- a/dom/imptests/html/typedarrays/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_constructors.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/typedarrays/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/html/webgl/Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_bufferSubData.html \
-  test_compressedTexImage2D.html \
-  test_compressedTexSubImage2D.html \
-  test_texImage2D.html \
-  test_texSubImage2D.html \
-  test_uniformMatrixNfv.html \
-  common.js \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/html/webgl/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
--- a/dom/imptests/importTestsuite.py
+++ b/dom/imptests/importTestsuite.py
@@ -109,54 +109,42 @@ def copy(dest, directories):
 
         for mochitest in d["mochitests"]:
             shutil.copy("%s/%s" % (sourcedir, mochitest), "%s/test_%s" % (destdir, mochitest))
         for reftest in sorted(reftestfiles):
             shutil.copy("%s/%s" % (sourcedir, reftest), "%s/%s" % (destdir, reftest))
         for support in d["supportfiles"]:
             shutil.copy("%s/%s" % (sourcedir, support), "%s/%s" % (destdir, support))
 
-def printMozbuildFile(dest, directories):
-    """Create a .mozbuild file to be included into the main moz.build, which
-    lists the directories with tests.
+def printBuildFiles(dest, directories):
+    """Create a mochitest.ini that all the contains tests we import.
     """
-    print("Creating mozbuild...")
-    path = dest + ".mozbuild"
-    with open(path, 'w') as fh:
-        normalized = [makeDestPath(dest, d["path"]) for d in directories]
-        result = writeBuildFiles.substMozbuild("importTestsuite.py",
-            normalized)
-        fh.write(result)
+    print("Creating manifest...")
+    all_mochitests = set()
+    all_support = set()
 
-    subprocess.check_call(["hg", "add", path])
-
-def printBuildFiles(dest, directories):
-    """Create Makefile.in files for each directory that contains tests we import.
-    """
-    print("Creating build files...")
     for d in directories:
         path = makeDestPath(dest, d["path"])
 
-        files = ["test_%s" % (mochitest, ) for mochitest in d["mochitests"]]
-        files.extend(d["supportfiles"])
-
-        with open(path + "/Makefile.in", "w") as fh:
-            result = writeBuildFiles.substMakefile("importTestsuite.py", files)
-            fh.write(result)
-
-        with open(path + "/moz.build", "w") as fh:
-            result = writeBuildFiles.substMozbuild("importTestsuite.py", [])
-            fh.write(result)
+        all_mochitests |= set('%s/test_%s' % (d['path'], mochitest)
+            for mochitest in d['mochitests'])
+        all_support |= set('%s/%s' % (d['path'], p) for p in d['supportfiles'])
 
         if d["reftests"]:
             with open(path + "/reftest.list", "w") as fh:
                 result = writeBuildFiles.substReftestList("importTestsuite.py",
                     d["reftests"])
                 fh.write(result)
 
+    manifest_path = dest + '/mochitest.ini'
+    with open(manifest_path, 'w') as fh:
+        result = writeBuildFiles.substManifest('importTestsuite.py',
+            all_mochitests, all_support)
+        fh.write(result)
+    subprocess.check_call(["hg", "add", manifest_path])
 
 def hgadd(dest, directories):
     """Inform hg of the files in |directories|."""
     print("hg addremoving...")
     for d in directories:
         subprocess.check_call(["hg", "addremove", makeDestPath(dest, d)])
 
 def removeAndCloneRepo(vcs, url, dest):
@@ -180,17 +168,16 @@ def importRepo(confFile):
 
         removeAndCloneRepo(vcs, url, hgdest)
 
         data = readManifests(iden, directories)
         print("Going to import %s..." % [d["path"] for d in data])
 
         copy(dest, data)
         printBuildFiles(dest, data)
-        printMozbuildFile(dest, data)
         hgadd(dest, directories)
         print("Removing %s again..." % hgdest)
         subprocess.check_call(["rm", "-rf", hgdest])
     except subprocess.CalledProcessError as e:
         print(e.returncode)
     finally:
         print("Done")
 
--- a/dom/imptests/moz.build
+++ b/dom/imptests/moz.build
@@ -26,11 +26,13 @@ DIRS += [
     'failures/html/js/builtins',
     'failures/html/microdata/microdata-dom-api',
     'failures/html/typedarrays',
     'failures/webapps/WebStorage/tests/submissions/Infraware',
     'failures/webapps/WebStorage/tests/submissions/Ms2ger',
     'failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger'
 ]
 
-include('editing.mozbuild')
-include('html.mozbuild')
-include('webapps.mozbuild')
+MOCHITEST_MANIFESTS += [
+    'editing/mochitest.ini',
+    'html/mochitest.ini',
+    'webapps/mochitest.ini',
+]
deleted file mode 100644
--- a/dom/imptests/webapps.mozbuild
+++ /dev/null
@@ -1,6 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestSuites.py - DO NOT EDIT
-
-DIRS += [
-    'webapps/WebStorage/tests/submissions',
-    'webapps/XMLHttpRequest/tests/submissions/Ms2ger',
-]
deleted file mode 100644
deleted file mode 100644
deleted file mode 100644
--- a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_event_constructor.html \
-  test_event_local_key.html \
-  test_event_local_newvalue.html \
-  test_event_local_oldvalue.html \
-  test_event_local_storagearea.html \
-  test_event_local_storageeventinit.html \
-  test_event_local_url.html \
-  test_event_session_key.html \
-  test_event_session_newvalue.html \
-  test_event_session_oldvalue.html \
-  test_event_session_storagearea.html \
-  test_event_session_storageeventinit.html \
-  test_event_session_url.html \
-  test_storage_local_clear.html \
-  test_storage_local_getitem.html \
-  test_storage_local_key.html \
-  test_storage_local_length.html \
-  test_storage_local_removeitem.html \
-  test_storage_local_security.html \
-  test_storage_local_setitem.html \
-  test_storage_session_clear.html \
-  test_storage_session_getitem.html \
-  test_storage_session_key.html \
-  test_storage_session_length.html \
-  test_storage_session_removeitem.html \
-  test_storage_session_setitem.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  local_change_item_iframe.html \
-  local_security_iframe.html \
-  local_set_item_clear_iframe.html \
-  local_set_item_iframe.html \
-  session_change_item_iframe.html \
-  session_set_item_clear_iframe.html \
-  session_set_item_iframe.html \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/iframe/moz.build
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/webapps/WebStorage/tests/submissions/Infraware/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-    'iframe',
-]
deleted file mode 100644
--- a/dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_event_constructor_js.html \
-  test_missing_arguments.html \
-  test_storage_local_builtins.html \
-  test_storage_local_clear_js.html \
-  test_storage_local_getitem_js.html \
-  test_storage_local_index_js.html \
-  test_storage_local_in_js.html \
-  test_storage_local_length_js.html \
-  test_storage_local_removeitem_js.html \
-  test_storage_local_setitem_js.html \
-  test_storage_session_builtins.html \
-  test_storage_session_clear_js.html \
-  test_storage_session_getitem_js.html \
-  test_storage_session_index_js.html \
-  test_storage_session_in_js.html \
-  test_storage_session_length_js.html \
-  test_storage_session_removeitem_js.html \
-  test_storage_session_setitem_js.html \
-  storage_builtins.js \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/webapps/WebStorage/tests/submissions/Ms2ger/moz.build
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/webapps/WebStorage/tests/submissions/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-    'Infraware',
-    'Ms2ger',
-]
deleted file mode 100644
--- a/dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_FormData-append.html \
-  test_interfaces.html \
-  test_setrequestheader-invalid-arguments.htm \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/webapps/XMLHttpRequest/tests/submissions/Ms2ger/moz.build
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
-
-DIRS += [
-]
new file mode 100644
--- /dev/null
+++ b/dom/imptests/webapps/mochitest.ini
@@ -0,0 +1,59 @@
+# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+  WebStorage/tests/submissions/Infraware/iframe/local_change_item_iframe.html
+  WebStorage/tests/submissions/Infraware/iframe/local_security_iframe.html
+  WebStorage/tests/submissions/Infraware/iframe/local_set_item_clear_iframe.html
+  WebStorage/tests/submissions/Infraware/iframe/local_set_item_iframe.html
+  WebStorage/tests/submissions/Infraware/iframe/session_change_item_iframe.html
+  WebStorage/tests/submissions/Infraware/iframe/session_set_item_clear_iframe.html
+  WebStorage/tests/submissions/Infraware/iframe/session_set_item_iframe.html
+  WebStorage/tests/submissions/Ms2ger/storage_builtins.js
+
+[WebStorage/tests/submissions/Infraware/test_event_constructor.html]
+[WebStorage/tests/submissions/Infraware/test_event_local_key.html]
+[WebStorage/tests/submissions/Infraware/test_event_local_newvalue.html]
+[WebStorage/tests/submissions/Infraware/test_event_local_oldvalue.html]
+[WebStorage/tests/submissions/Infraware/test_event_local_storagearea.html]
+[WebStorage/tests/submissions/Infraware/test_event_local_storageeventinit.html]
+[WebStorage/tests/submissions/Infraware/test_event_local_url.html]
+[WebStorage/tests/submissions/Infraware/test_event_session_key.html]
+[WebStorage/tests/submissions/Infraware/test_event_session_newvalue.html]
+[WebStorage/tests/submissions/Infraware/test_event_session_oldvalue.html]
+[WebStorage/tests/submissions/Infraware/test_event_session_storagearea.html]
+[WebStorage/tests/submissions/Infraware/test_event_session_storageeventinit.html]
+[WebStorage/tests/submissions/Infraware/test_event_session_url.html]
+[WebStorage/tests/submissions/Infraware/test_storage_local_clear.html]
+[WebStorage/tests/submissions/Infraware/test_storage_local_getitem.html]
+[WebStorage/tests/submissions/Infraware/test_storage_local_key.html]
+[WebStorage/tests/submissions/Infraware/test_storage_local_length.html]
+[WebStorage/tests/submissions/Infraware/test_storage_local_removeitem.html]
+[WebStorage/tests/submissions/Infraware/test_storage_local_security.html]
+[WebStorage/tests/submissions/Infraware/test_storage_local_setitem.html]
+[WebStorage/tests/submissions/Infraware/test_storage_session_clear.html]
+[WebStorage/tests/submissions/Infraware/test_storage_session_getitem.html]
+[WebStorage/tests/submissions/Infraware/test_storage_session_key.html]
+[WebStorage/tests/submissions/Infraware/test_storage_session_length.html]
+[WebStorage/tests/submissions/Infraware/test_storage_session_removeitem.html]
+[WebStorage/tests/submissions/Infraware/test_storage_session_setitem.html]
+[WebStorage/tests/submissions/Ms2ger/test_event_constructor_js.html]
+[WebStorage/tests/submissions/Ms2ger/test_missing_arguments.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_local_builtins.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_local_clear_js.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_local_getitem_js.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_local_in_js.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_local_index_js.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_local_length_js.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_local_removeitem_js.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_local_setitem_js.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_session_builtins.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_session_clear_js.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_session_getitem_js.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_session_in_js.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_session_index_js.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_session_length_js.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_session_removeitem_js.html]
+[WebStorage/tests/submissions/Ms2ger/test_storage_session_setitem_js.html]
+[XMLHttpRequest/tests/submissions/Ms2ger/test_FormData-append.html]
+[XMLHttpRequest/tests/submissions/Ms2ger/test_interfaces.html]
+[XMLHttpRequest/tests/submissions/Ms2ger/test_setrequestheader-invalid-arguments.htm]
--- a/dom/imptests/writeBuildFiles.py
+++ b/dom/imptests/writeBuildFiles.py
@@ -11,16 +11,24 @@ makefile_template = """# THIS FILE IS AU
 ${files}
 """
 
 mozbuild_template = """# THIS FILE IS AUTOGENERATED BY ${caller} - DO NOT EDIT
 
 ${dirs}
 """
 
+manifest_template = """# THIS FILE IS AUTOGENERATED BY ${caller} - DO NOT EDIT
+[DEFAULT]
+support-files =
+${supportfiles}
+
+${tests}
+"""
+
 reftest_template = """# THIS FILE IS AUTOGENERATED BY ${caller} - DO NOT EDIT
 
 ${reftests}
 """
 
 
 
 def makefileString(entries):
@@ -51,16 +59,27 @@ def substMakefile(caller, files):
 
 def substMozbuild(caller, dirs):
     return string.Template(mozbuild_template).substitute({
         "caller": caller,
         "dirs": mozbuildDirs(dirs),
     })
 
 
+def substManifest(caller, test_files, support_files):
+    test_files = [f.lstrip('/') for f in test_files]
+    support_files = [f.lstrip('/') for f in support_files]
+
+    return string.Template(manifest_template).substitute({
+        'caller': caller,
+        'supportfiles': '\n'.join('  %s' % f for f in sorted(support_files)),
+        'tests': '\n'.join('[%s]' % f for f in sorted(test_files))
+    })
+
+
 def substReftestList(caller, tests):
     def reftests(tests):
         return "\n".join(" ".join(line) for line in tests)
 
     return string.Template(reftest_template).substitute({
         "caller": caller,
         "reftests": reftests(tests),
     })