зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1523582 Part 4 - Support comment at the end of line in failures.list, and regenerate reftest.list. r=dbaron
Differential Revision: https://phabricator.services.mozilla.com/D44028 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Ting-Yu Lin
Родитель
f3999c81a8
Коммит
30ef7a225a
|
|
@ -1,7 +1,9 @@
|
|||
# LIST OF REFTEST FAILURES FROM IMPORTS
|
||||
#
|
||||
# The syntax of this file is as follows:
|
||||
# 1) All lines marked with a '#' are comments.
|
||||
# 1) All lines marked with a '#' are comments. Comments can also be written
|
||||
# at the end of the line, which are copied to the auto-generated
|
||||
# received/reftest.list.
|
||||
# 2) A failure is denoted by <failure-type>* (as described in
|
||||
# layout/tools/reftest/README.txt) and a path pattern starting
|
||||
# with module. E.g.:
|
||||
|
|
@ -219,9 +221,9 @@ fuzzy(0-135,0-530) css-multicol/multicol-containing-001.xht
|
|||
fuzzy(0-215,0-241) css-multicol/multicol-containing-002.xht
|
||||
fuzzy(0-87,0-180) css-multicol/multicol-count-001.xht
|
||||
fails-if(!OSX) random-if(OSX) css-multicol/multicol-count-002.xht
|
||||
css-multicol/multicol-count-computed-003.xht
|
||||
fuzzy-if(winWidget||OSX||gtkWidget,0-112,0-861) css-multicol/multicol-count-computed-004.xht
|
||||
css-multicol/multicol-count-computed-005.xht
|
||||
fails-if(geckoview) css-multicol/multicol-count-computed-003.xht # Bug 1558509 for GV
|
||||
fuzzy-if(winWidget||OSX||gtkWidget,0-112,0-861) fails-if(geckoview) css-multicol/multicol-count-computed-004.xht # Bug 1558509 for GV
|
||||
fails-if(geckoview) css-multicol/multicol-count-computed-005.xht # Bug 1558509 for GV
|
||||
fuzzy(0-204,0-930) fuzzy-if(skiaContent,0-208,0-930) css-multicol/multicol-count-negative-001.xht
|
||||
fuzzy(0-204,0-930) fuzzy-if(skiaContent,0-208,0-930) css-multicol/multicol-count-negative-002.xht
|
||||
fuzzy(0-204,0-930) fuzzy-if(skiaContent,0-208,0-930) css-multicol/multicol-count-non-integer-001.xht
|
||||
|
|
@ -235,7 +237,7 @@ fuzzy(0-255,0-329) css-multicol/multicol-gap-001.xht
|
|||
fuzzy(0-204,0-930) fuzzy-if(skiaContent,0-208,0-930) css-multicol/multicol-gap-002.xht
|
||||
fuzzy(0-204,0-930) fuzzy-if(skiaContent,0-208,0-930) css-multicol/multicol-gap-003.xht
|
||||
fuzzy(0-107,0-1823) css-multicol/multicol-gap-fraction-001.xht
|
||||
fuzzy-if(winWidget||OSX||gtkWidget,0-204,0-1048) fuzzy-if(skiaContent,0-208,0-1048) css-multicol/multicol-gap-large-001.xht
|
||||
fuzzy-if(winWidget||OSX||gtkWidget,0-204,0-1048) fuzzy-if(skiaContent,0-208,0-1048) fails-if(geckoview) css-multicol/multicol-gap-large-001.xht # Bug 1558509 for GV
|
||||
fuzzy(0-225,0-920) css-multicol/multicol-gap-large-002.xht
|
||||
fuzzy(0-204,0-930) fuzzy-if(skiaContent,0-208,0-930) css-multicol/multicol-gap-negative-001.xht
|
||||
pref(layout.css.column-span.enabled,true) css-multicol/multicol-height-block-child-001.xht
|
||||
|
|
@ -283,10 +285,10 @@ pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-000.xht
|
|||
pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-001.xht
|
||||
pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-002.xht
|
||||
pref(layout.css.column-span.enabled,true) fails-if(!OSX) random-if(OSX) css-multicol/multicol-span-all-003.xht
|
||||
pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-margin-001.xht
|
||||
pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-margin-002.xht
|
||||
pref(layout.css.column-span.enabled,true) fails-if(geckoview) css-multicol/multicol-span-all-margin-001.xht # Bug 1558509 for GV
|
||||
pref(layout.css.column-span.enabled,true) fails-if(geckoview) css-multicol/multicol-span-all-margin-002.xht # Bug 1558509 for GV
|
||||
pref(layout.css.column-span.enabled,true) fails css-multicol/multicol-span-all-margin-bottom-001.xht
|
||||
pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-margin-nested-001.xht
|
||||
pref(layout.css.column-span.enabled,true) fails-if(geckoview) css-multicol/multicol-span-all-margin-nested-001.xht # Bug 1558509 for GV
|
||||
pref(layout.css.column-span.enabled,true) fails css-multicol/multicol-span-all-margin-nested-002.xht
|
||||
pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-all-margin-nested-firstchild-001.xht
|
||||
pref(layout.css.column-span.enabled,true) css-multicol/multicol-span-float-001.xht
|
||||
|
|
|
|||
|
|
@ -317,14 +317,18 @@ def read_fail_list():
|
|||
with open(os.path.join(dirname, "failures.list"), "rb") as f:
|
||||
for line in f:
|
||||
line = line.strip()
|
||||
if not line or line.startswith("#"):
|
||||
line_comment = line.split("#")
|
||||
if not line or not line_comment[0]:
|
||||
# line_comment[0] is an empty string if the line begins
|
||||
# with a '#'
|
||||
continue
|
||||
items = line.split()
|
||||
items = line_comment[0].split()
|
||||
comment = '' if len(line_comment) == 1 else line_comment[1]
|
||||
refpat = None
|
||||
if items[-1].startswith("ref:"):
|
||||
refpat = re.compile(fnmatch.translate(items.pop()[4:]))
|
||||
pat = re.compile(fnmatch.translate(items.pop()))
|
||||
gFailList.append((pat, refpat, items))
|
||||
gFailList.append((pat, refpat, items, comment))
|
||||
|
||||
def main():
|
||||
global gDestPath, gLog, gTestfiles, gTestFlags, gFailList
|
||||
|
|
@ -369,11 +373,16 @@ def main():
|
|||
testKey = test[key]
|
||||
refKey = test[key + 1]
|
||||
fail = []
|
||||
for pattern, refpattern, failureType in gFailList:
|
||||
comment = ''
|
||||
for pattern, refpattern, failureType, failureComment in gFailList:
|
||||
if (refpattern is None or refpattern.match(refKey)) and \
|
||||
pattern.match(testKey):
|
||||
fail = failureType
|
||||
if failureComment:
|
||||
comment = "#" + failureComment
|
||||
test = fail + test
|
||||
if comment:
|
||||
test.append(comment)
|
||||
listfile.write(" ".join(test) + "\n")
|
||||
listfile.close()
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Importing revision: 15f199c91a72b0d51bf0a12b3b77827ecb5051ff
|
||||
from repository: https://github.com/neerjapancholi/web-platform-tests.git
|
||||
from repository: https://github.com/web-platform-tests/wpt.git
|
||||
Importing css-conditional/OWNERS to css-conditional/OWNERS
|
||||
Importing css-conditional/at-media-whitespace-optional-001.html to css-conditional/at-media-whitespace-optional-001.html
|
||||
Importing css-conditional/reference/background-lime.html to css-conditional/reference/background-lime.html
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче