Bug 924160 - Part b: Use mochitest manifests for the expected failures in dom/imptests; r=gps
authorMs2ger <ms2ger@gmail.com>
Mon, 20 Jan 2014 08:58:24 +0100
changeset 164240 a4769f7058da469537cc627e21f6528d26de5e25
parent 164239 b0f69426a5a2d4cfa226f8da9a6b04e8c81a41c0
child 164241 b9627e699d6bd089f85f8f022036c842aaf3afdc
push id26031
push userMs2ger@gmail.com
push dateMon, 20 Jan 2014 08:08:21 +0000
treeherdermozilla-central@f2d8bb102e05 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs924160
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 924160 - Part b: Use mochitest manifests for the expected failures in dom/imptests; r=gps
dom/imptests/failures/editing/conformancetest/Makefile.in
dom/imptests/failures/editing/conformancetest/mochitest.ini
dom/imptests/failures/editing/conformancetest/moz.build
dom/imptests/failures/editing/selecttest/Makefile.in
dom/imptests/failures/editing/selecttest/mochitest.ini
dom/imptests/failures/editing/selecttest/moz.build
dom/imptests/failures/html/dom/Makefile.in
dom/imptests/failures/html/dom/collections/Makefile.in
dom/imptests/failures/html/dom/collections/mochitest.ini
dom/imptests/failures/html/dom/collections/moz.build
dom/imptests/failures/html/dom/errors/Makefile.in
dom/imptests/failures/html/dom/errors/mochitest.ini
dom/imptests/failures/html/dom/errors/moz.build
dom/imptests/failures/html/dom/lists/Makefile.in
dom/imptests/failures/html/dom/lists/mochitest.ini
dom/imptests/failures/html/dom/lists/moz.build
dom/imptests/failures/html/dom/mochitest.ini
dom/imptests/failures/html/dom/moz.build
dom/imptests/failures/html/dom/nodes/Makefile.in
dom/imptests/failures/html/dom/nodes/mochitest.ini
dom/imptests/failures/html/dom/nodes/moz.build
dom/imptests/failures/html/html/browsers/the-window-object/Makefile.in
dom/imptests/failures/html/html/browsers/the-window-object/mochitest.ini
dom/imptests/failures/html/html/browsers/the-window-object/moz.build
dom/imptests/failures/html/html/browsers/the-window-object/named-access-on-the-window-object/Makefile.in
dom/imptests/failures/html/html/browsers/the-window-object/named-access-on-the-window-object/mochitest.ini
dom/imptests/failures/html/html/browsers/the-window-object/named-access-on-the-window-object/moz.build
dom/imptests/failures/html/html/dom/documents/dta/Makefile.in
dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/Makefile.in
dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/mochitest.ini
dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/moz.build
dom/imptests/failures/html/html/dom/documents/dta/mochitest.ini
dom/imptests/failures/html/html/dom/documents/dta/moz.build
dom/imptests/failures/html/html/dom/elements/global-attributes/moz.build
dom/imptests/failures/html/html/obsolete/implreq/oeaaa/Makefile.in
dom/imptests/failures/html/html/obsolete/implreq/oeaaa/mochitest.ini
dom/imptests/failures/html/html/obsolete/implreq/oeaaa/moz.build
dom/imptests/failures/html/html/semantics/forms/the-form-element/Makefile.in
dom/imptests/failures/html/html/semantics/forms/the-form-element/mochitest.ini
dom/imptests/failures/html/html/semantics/forms/the-form-element/moz.build
dom/imptests/failures/html/html/semantics/forms/the-option-element/Makefile.in
dom/imptests/failures/html/html/semantics/forms/the-option-element/mochitest.ini
dom/imptests/failures/html/html/semantics/forms/the-option-element/moz.build
dom/imptests/failures/html/html/semantics/forms/the-select-element/Makefile.in
dom/imptests/failures/html/html/semantics/forms/the-select-element/mochitest.ini
dom/imptests/failures/html/html/semantics/forms/the-select-element/moz.build
dom/imptests/failures/html/html/semantics/scripting-1/the-script-element/Makefile.in
dom/imptests/failures/html/html/semantics/scripting-1/the-script-element/mochitest.ini
dom/imptests/failures/html/html/semantics/scripting-1/the-script-element/moz.build
dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/Makefile.in
dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/mochitest.ini
dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/moz.build
dom/imptests/failures/html/html/webappapis/atob/Makefile.in
dom/imptests/failures/html/html/webappapis/atob/mochitest.ini
dom/imptests/failures/html/html/webappapis/atob/moz.build
dom/imptests/failures/html/js/builtins/Makefile.in
dom/imptests/failures/html/js/builtins/mochitest.ini
dom/imptests/failures/html/js/builtins/moz.build
dom/imptests/failures/html/microdata/microdata-dom-api/Makefile.in
dom/imptests/failures/html/microdata/microdata-dom-api/mochitest.ini
dom/imptests/failures/html/microdata/microdata-dom-api/moz.build
dom/imptests/failures/html/typedarrays/Makefile.in
dom/imptests/failures/html/typedarrays/mochitest.ini
dom/imptests/failures/html/typedarrays/moz.build
dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/Makefile.in
dom/imptests/failures/webapps/DOMCore/tests/submissions/Opera/Makefile.in
dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/mochitest.ini
dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/moz.build
dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/mochitest.ini
dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/moz.build
dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/mochitest.ini
dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/moz.build
dom/imptests/moz.build
dom/imptests/parseFailures.py
dom/imptests/writeBuildFiles.py
deleted file mode 100644
--- a/dom/imptests/failures/editing/conformancetest/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_event.html.json \
-  test_runtest.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/editing/conformancetest/mochitest.ini
@@ -0,0 +1,7 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_event.html.json]
+[test_runtest.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/editing/conformancetest/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/editing/selecttest/Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_Document-open.html.json \
-  test_addRange.html.json \
-  test_collapse.html.json \
-  test_collapseToStartEnd.html.json \
-  test_extend.html.json \
-  test_getSelection.html.json \
-  test_removeAllRanges.html.json \
-  test_selectAllChildren.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/editing/selecttest/mochitest.ini
@@ -0,0 +1,13 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_Document-open.html.json]
+[test_addRange.html.json]
+[test_collapse.html.json]
+[test_collapseToStartEnd.html.json]
+[test_extend.html.json]
+[test_getSelection.html.json]
+[test_removeAllRanges.html.json]
+[test_selectAllChildren.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/editing/selecttest/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/dom/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_historical.html.json \
-  test_interfaces.html.json \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/failures/html/dom/collections/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_HTMLCollection-empty-name.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/dom/collections/mochitest.ini
@@ -0,0 +1,6 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_HTMLCollection-empty-name.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/dom/collections/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/dom/errors/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_exceptions.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/dom/errors/mochitest.ini
@@ -0,0 +1,6 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_exceptions.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/dom/errors/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/dom/lists/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_DOMTokenList-stringifier.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/dom/lists/mochitest.ini
@@ -0,0 +1,6 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_DOMTokenList-stringifier.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/dom/lists/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/dom/mochitest.ini
@@ -0,0 +1,7 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_historical.html.json]
+[test_interfaces.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/dom/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/dom/nodes/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_Document-createElement-namespace.html.json \
-  test_Document-createElementNS.html.json \
-  test_Document-createEvent.html.json \
-  test_Document-getElementsByTagName.html.json \
-  test_Node-isEqualNode.xhtml.json \
-  test_Node-properties.html.json \
-  test_attributes.html.json \
-  test_case.html.json \
-  test_getElementsByClassName-10.xml.json \
-  test_getElementsByClassName-11.xml.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/dom/nodes/mochitest.ini
@@ -0,0 +1,15 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_Document-createElement-namespace.html.json]
+[test_Document-createElementNS.html.json]
+[test_Document-createEvent.html.json]
+[test_Document-getElementsByTagName.html.json]
+[test_Node-isEqualNode.xhtml.json]
+[test_Node-properties.html.json]
+[test_attributes.html.json]
+[test_case.html.json]
+[test_getElementsByClassName-10.xml.json]
+[test_getElementsByClassName-11.xml.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/dom/nodes/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/browsers/the-window-object/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-# Disabled due to bug 859075
-#  test_window-named-properties.html.json \
-
-MOCHITEST_FILES := \
-  test_window-indexed-properties-strict.html.json \
-  test_window-properties.html.json \
-  test_window-prototype-chain.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/html/browsers/the-window-object/mochitest.ini
@@ -0,0 +1,10 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_window-indexed-properties-strict.html.json]
+[test_window-named-properties.html.json]
+skip-if = true # bug 859075
+[test_window-properties.html.json]
+[test_window-prototype-chain.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/browsers/the-window-object/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/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 parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_window-null-names.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/html/browsers/the-window-object/named-access-on-the-window-object/mochitest.ini
@@ -0,0 +1,6 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_window-null-names.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/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 parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/dom/documents/dta/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_document.images.html.json \
-  test_document.title-03.html.json \
-  test_document.title-04.xhtml.json \
-  test_document.title-06.html.json \
-  test_document.title-07.html.json \
-  test_nameditem-02.html.json \
-  test_nameditem-03.html.json \
-  test_nameditem-04.html.json \
-  test_nameditem-05.html.json \
-  test_nameditem-06.html.json \
-  $(NULL)
deleted file mode 100644
--- a/dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_document.getElementsByName-newelements.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/mochitest.ini
@@ -0,0 +1,6 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_document.getElementsByName-newelements.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/dom/documents/dta/doc.gEBN/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/html/dom/documents/dta/mochitest.ini
@@ -0,0 +1,15 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_document.images.html.json]
+[test_document.title-03.html.json]
+[test_document.title-04.xhtml.json]
+[test_document.title-06.html.json]
+[test_document.title-07.html.json]
+[test_nameditem-02.html.json]
+[test_nameditem-03.html.json]
+[test_nameditem-04.html.json]
+[test_nameditem-05.html.json]
+[test_nameditem-06.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/dom/documents/dta/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/dom/elements/global-attributes/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/obsolete/implreq/oeaaa/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_script-IDL-event-htmlfor.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/html/obsolete/implreq/oeaaa/mochitest.ini
@@ -0,0 +1,6 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_script-IDL-event-htmlfor.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/obsolete/implreq/oeaaa/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/semantics/forms/the-form-element/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_form-elements-nameditem-01.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/html/semantics/forms/the-form-element/mochitest.ini
@@ -0,0 +1,6 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_form-elements-nameditem-01.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/semantics/forms/the-form-element/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/semantics/forms/the-option-element/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_option-text-spaces.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/html/semantics/forms/the-option-element/mochitest.ini
@@ -0,0 +1,6 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_option-text-spaces.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/semantics/forms/the-option-element/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/semantics/forms/the-select-element/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_select-named-getter.html.json \
-  test_select-remove.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/html/semantics/forms/the-select-element/mochitest.ini
@@ -0,0 +1,7 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_select-named-getter.html.json]
+[test_select-remove.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/semantics/forms/the-select-element/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/semantics/scripting-1/the-script-element/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_script-for-event.html.json \
-  test_script-language-type.html.json \
-  test_script-languages-01.html.json \
-  test_script-languages-02.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/html/semantics/scripting-1/the-script-element/mochitest.ini
@@ -0,0 +1,9 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_script-for-event.html.json]
+[test_script-language-type.html.json]
+[test_script-languages-01.html.json]
+[test_script-languages-02.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/semantics/scripting-1/the-script-element/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_table-insertRow.html.json \
-  test_table-rows.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/mochitest.ini
@@ -0,0 +1,7 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_table-insertRow.html.json]
+[test_table-rows.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/webappapis/atob/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_base64.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/html/webappapis/atob/mochitest.ini
@@ -0,0 +1,6 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_base64.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/html/webappapis/atob/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/js/builtins/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_WeakMap.prototype-properties.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/js/builtins/mochitest.ini
@@ -0,0 +1,6 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_WeakMap.prototype-properties.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/js/builtins/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/microdata/microdata-dom-api/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_001.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/microdata/microdata-dom-api/mochitest.ini
@@ -0,0 +1,6 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_001.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/microdata/microdata-dom-api/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/html/typedarrays/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_constructors.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/html/typedarrays/mochitest.ini
@@ -0,0 +1,6 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_constructors.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/html/typedarrays/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
deleted file mode 100644
deleted file mode 100644
--- a/dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_storage_local_security.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/mochitest.ini
@@ -0,0 +1,6 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_storage_local_security.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/webapps/WebStorage/tests/submissions/Infraware/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 parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_missing_arguments.html.json \
-  test_storage_local_builtins.html.json \
-  test_storage_local_in_js.html.json \
-  test_storage_local_removeitem_js.html.json \
-  test_storage_session_builtins.html.json \
-  test_storage_session_in_js.html.json \
-  test_storage_session_removeitem_js.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/webapps/WebStorage/tests/submissions/Ms2ger/mochitest.ini
@@ -0,0 +1,12 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_missing_arguments.html.json]
+[test_storage_local_builtins.html.json]
+[test_storage_local_in_js.html.json]
+[test_storage_local_removeitem_js.html.json]
+[test_storage_session_builtins.html.json]
+[test_storage_session_in_js.html.json]
+[test_storage_session_removeitem_js.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/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 parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
deleted file mode 100644
--- a/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
-
-MOCHITEST_FILES := \
-  test_interfaces.html.json \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/dom/imptests/failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/mochitest.ini
@@ -0,0 +1,6 @@
+# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
+[DEFAULT]
+support-files =
+
+
+[test_interfaces.html.json]
deleted file mode 100644
--- a/dom/imptests/failures/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 parseFailures.py - DO NOT EDIT
-
-DIRS += [
-]
--- a/dom/imptests/moz.build
+++ b/dom/imptests/moz.build
@@ -1,38 +1,38 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += [
-    'failures/editing/conformancetest',
-    'failures/editing/selecttest',
-    'failures/html/dom',
-    'failures/html/dom/collections',
-    'failures/html/dom/errors',
-    'failures/html/dom/lists',
-    'failures/html/dom/nodes',
-    'failures/html/html/browsers/the-window-object',
-    'failures/html/html/browsers/the-window-object/named-access-on-the-window-object',
-    'failures/html/html/dom/documents/dta',
-    'failures/html/html/dom/documents/dta/doc.gEBN',
-    'failures/html/html/obsolete/implreq/oeaaa',
-    'failures/html/html/semantics/forms/the-form-element',
-    'failures/html/html/semantics/forms/the-option-element',
-    'failures/html/html/semantics/forms/the-select-element',
-    'failures/html/html/semantics/scripting-1/the-script-element',
-    'failures/html/html/semantics/tabular-data/the-table-element',
-    'failures/html/html/webappapis/atob',
-    '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'
-]
-
 MOCHITEST_MANIFESTS += [
     'editing/mochitest.ini',
     'html/mochitest.ini',
     'webapps/mochitest.ini',
 ]
+
+MOCHITEST_MANIFESTS += [
+    'failures/editing/conformancetest/mochitest.ini',
+    'failures/editing/selecttest/mochitest.ini',
+    'failures/html/dom/collections/mochitest.ini',
+    'failures/html/dom/errors/mochitest.ini',
+    'failures/html/dom/lists/mochitest.ini',
+    'failures/html/dom/mochitest.ini',
+    'failures/html/dom/nodes/mochitest.ini',
+    'failures/html/html/browsers/the-window-object/mochitest.ini',
+    'failures/html/html/browsers/the-window-object/named-access-on-the-window-object/mochitest.ini',
+    'failures/html/html/dom/documents/dta/doc.gEBN/mochitest.ini',
+    'failures/html/html/dom/documents/dta/mochitest.ini',
+    'failures/html/html/obsolete/implreq/oeaaa/mochitest.ini',
+    'failures/html/html/semantics/forms/the-form-element/mochitest.ini',
+    'failures/html/html/semantics/forms/the-option-element/mochitest.ini',
+    'failures/html/html/semantics/forms/the-select-element/mochitest.ini',
+    'failures/html/html/semantics/scripting-1/the-script-element/mochitest.ini',
+    'failures/html/html/semantics/tabular-data/the-table-element/mochitest.ini',
+    'failures/html/html/webappapis/atob/mochitest.ini',
+    'failures/html/js/builtins/mochitest.ini',
+    'failures/html/microdata/microdata-dom-api/mochitest.ini',
+    'failures/html/typedarrays/mochitest.ini',
+    'failures/webapps/WebStorage/tests/submissions/Infraware/mochitest.ini',
+    'failures/webapps/WebStorage/tests/submissions/Ms2ger/mochitest.ini',
+    'failures/webapps/XMLHttpRequest/tests/submissions/Ms2ger/mochitest.ini',
+]
--- a/dom/imptests/parseFailures.py
+++ b/dom/imptests/parseFailures.py
@@ -54,25 +54,20 @@ def dumpFailures(lines):
 
 def writeFiles(files):
     pathmap = {}
     for path in files:
         dirp, leaf = path.rsplit('/', 1)
         pathmap.setdefault(dirp, []).append(leaf)
 
     for k, v in pathmap.items():
-        with open(k + '/Makefile.in', 'wb') as fh:
-            result = writeBuildFiles.substMakefile('parseFailures.py', v)
-            result = result.encode('utf-8')
+        with open(k + '/mochitest.ini', 'w') as fh:
+            result = writeBuildFiles.substManifest('parseFailures.py', v, [])
             fh.write(result)
 
-        with open(k + '/moz.build', 'wb') as fh:
-            result = writeBuildFiles.substMozbuild('parseFailures.py', [])
-            result = result.encode('utf-8')
-            fh.write(result)
 
 def main(logPath):
     fp = open(logPath, 'rb')
     lines = extractLines(fp)
     fp.close()
 
     files = dumpFailures(lines)
     writeFiles(files)
--- a/dom/imptests/writeBuildFiles.py
+++ b/dom/imptests/writeBuildFiles.py
@@ -1,74 +1,31 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from __future__ import unicode_literals
 
 import string
 
-makefile_template = """# THIS FILE IS AUTOGENERATED BY ${caller} - DO NOT EDIT
-
-${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):
-    if not len(entries):
-        return "  $(NULL)"
-    return "\n".join(["  %s \\" % (entry, ) for entry in entries]) + "\n  $(NULL)"
-
-
-def assignList(variable, entries):
-    return "%s := \\\n%s" % (variable, makefileString(entries))
-
-
-def mozbuildDirs(dirs):
-    """Obtain a DIRS assignment string for mozbuild files."""
-    parts = ['DIRS += [']
-    for d in dirs:
-        parts.append("    '%s'," % d)
-    parts.append(']')
-
-    return '\n'.join(parts)
-
-def substMakefile(caller, files):
-    return string.Template(makefile_template).substitute({
-        "caller": caller,
-        "files": assignList("MOCHITEST_FILES", files) if files else ""
-    })
-
-
-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))