Bug 924160 - Part b: Use mochitest manifests for the expected failures in dom/imptests; r=gps

This commit is contained in:
Ms2ger 2014-01-20 08:58:24 +01:00
parent 11ed62c517
commit 9b0b713f31
73 changed files with 205 additions and 333 deletions

View File

@ -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)

View File

@ -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]

View File

@ -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)

View File

@ -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]

View File

@ -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)

View File

@ -1,5 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
MOCHITEST_FILES := \
test_HTMLCollection-empty-name.html.json \
$(NULL)

View File

@ -0,0 +1,6 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
[DEFAULT]
support-files =
[test_HTMLCollection-empty-name.html.json]

View File

@ -1,4 +1,6 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
[DEFAULT]
support-files =
DIRS += [
]
[test_exceptions.html.json]

View File

@ -1,5 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
MOCHITEST_FILES := \
test_DOMTokenList-stringifier.html.json \
$(NULL)

View File

@ -0,0 +1,6 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
[DEFAULT]
support-files =
[test_DOMTokenList-stringifier.html.json]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -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]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -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)

View File

@ -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]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -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)

View File

@ -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]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -1,5 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
MOCHITEST_FILES := \
test_window-null-names.html.json \
$(NULL)

View File

@ -1,5 +1,6 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
[DEFAULT]
support-files =
MOCHITEST_FILES := \
test_exceptions.html.json \
$(NULL)
[test_window-null-names.html.json]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -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)

View File

@ -1,5 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
MOCHITEST_FILES := \
test_document.getElementsByName-newelements.html.json \
$(NULL)

View File

@ -0,0 +1,6 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
[DEFAULT]
support-files =
[test_document.getElementsByName-newelements.html.json]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -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]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -1,5 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
MOCHITEST_FILES := \
test_script-IDL-event-htmlfor.html.json \
$(NULL)

View File

@ -0,0 +1,6 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
[DEFAULT]
support-files =
[test_script-IDL-event-htmlfor.html.json]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -1,5 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
MOCHITEST_FILES := \
test_form-elements-nameditem-01.html.json \
$(NULL)

View File

@ -0,0 +1,6 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
[DEFAULT]
support-files =
[test_form-elements-nameditem-01.html.json]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -1,5 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
MOCHITEST_FILES := \
test_option-text-spaces.html.json \
$(NULL)

View File

@ -0,0 +1,6 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
[DEFAULT]
support-files =
[test_option-text-spaces.html.json]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -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)

View File

@ -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]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -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)

View File

@ -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]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -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)

View File

@ -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]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -1,5 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
MOCHITEST_FILES := \
test_base64.html.json \
$(NULL)

View File

@ -1,4 +1,6 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
[DEFAULT]
support-files =
DIRS += [
]
[test_base64.html.json]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -1,5 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
MOCHITEST_FILES := \
test_WeakMap.prototype-properties.html.json \
$(NULL)

View File

@ -0,0 +1,6 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
[DEFAULT]
support-files =
[test_WeakMap.prototype-properties.html.json]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -1,5 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
MOCHITEST_FILES := \
test_001.html.json \
$(NULL)

View File

@ -1,4 +1,6 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
[DEFAULT]
support-files =
DIRS += [
]
[test_001.html.json]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -1,5 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
MOCHITEST_FILES := \
test_constructors.html.json \
$(NULL)

View File

@ -0,0 +1,6 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
[DEFAULT]
support-files =
[test_constructors.html.json]

View File

@ -1,4 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
DIRS += [
]

View File

@ -1,5 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
MOCHITEST_FILES := \
test_storage_local_security.html.json \
$(NULL)

View File

@ -0,0 +1,6 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
[DEFAULT]
support-files =
[test_storage_local_security.html.json]

View File

@ -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 += [
]

View File

@ -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)

View File

@ -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]

View File

@ -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 += [
]

View File

@ -1,5 +0,0 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
MOCHITEST_FILES := \
test_interfaces.html.json \
$(NULL)

View File

@ -1,4 +1,6 @@
# THIS FILE IS AUTOGENERATED BY parseFailures.py - DO NOT EDIT
[DEFAULT]
support-files =
DIRS += [
]
[test_interfaces.html.json]

View File

@ -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 += [
]

View File

@ -4,35 +4,35 @@
# 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',
]

View File

@ -59,15 +59,10 @@ def writeFiles(files):
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')

View File

@ -6,16 +6,6 @@ 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 =
@ -31,39 +21,6 @@ ${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]