Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 14:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1436084 - Update webrender reftest expectations in w3c-css received reftests. r=xidorn

Browse Source 
In some cases there are imported tests where the same test is compared against
two reference pages, once as == and once as !=. Webrender is currently failing
the == tests but not the != tests. However there is no way to annotate this
precisely in the failures.list file, so we had previously marked the tests
as random-if. This patch modifies the import-tests.py to recognize a ref:<file>
argument in failures.list to match the reference file as well, and uses it to
clarify the webrender reftest expectations.

MozReview-Commit-ID: 6nAXoCQDreI

--HG--
extra : rebase_source : 93633ed6f62ccfb4b28ebed34943781350c4c831
This commit is contained in:
Kartikaya Gupta 2018-02-06 11:52:39 -05:00
parent 4751a8b16b
commit 999b2376cb
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/reftests/w3c-css/failures.list
View File

@ -116,7 +116,9 @@ fuzzy-if(OSX||winWidget,255,480) css-writing-modes/text-indent-v??-0??.xht
fuzzy-if(OSX||winWidget,226,960) css-writing-modes/text-orientation-016.xht
fuzzy-if(OSX||winWidget,223,720) css-writing-modes/vertical-alignment-*.xht
fuzzy-if(OSX||winWidget,153,612) css-writing-modes/writing-mode-vertical-??-00?.*
fuzzy(255,960) random-if(webrender) css-writing-modes/text-combine-upright-value-all-00?.html
fuzzy(255,960) css-writing-modes/text-combine-upright-value-all-00?.html
fuzzy(255,960) fails-if(webrender) css-writing-modes/text-combine-upright-value-all-002.html ref:css-writing-modes/reference/vertical-ahem-1x1-ref.html
fuzzy(255,960) fails-if(webrender) css-writing-modes/text-combine-upright-value-all-003.html ref:css-writing-modes/reference/vertical-ahem-1x1-ref.html
# Bug 1167911
skip css-writing-modes/abs-pos-non-replaced-icb-vlr-021.xht

11
layout/reftests/w3c-css/import-tests.py
View File

@ -326,8 +326,11 @@ def read_fail_list():
if not line or line.startswith("#"):
continue
items = line.split()
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, items))
gFailList.append((pat, refpat, items))
def main():
global gDestPath, gLog, gTestfiles, gTestFlags, gFailList
@ -364,9 +367,11 @@ def main():
test[key] = to_unix_path_sep(test[key])
test[key + 1] = to_unix_path_sep(test[key + 1])
testKey = test[key]
refKey = test[key + 1]
fail = []
for pattern, failureType in gFailList:
if pattern.match(testKey):
for pattern, refpattern, failureType in gFailList:
if (refpattern is None or refpattern.match(refKey)) and \
pattern.match(testKey):
fail = failureType
test = fail + test
listfile.write(" ".join(test) + "\n")

10
layout/reftests/w3c-css/received/reftest.list
View File

@ -1079,11 +1079,11 @@ fuzzy-if(OSX,15,16) == css-writing-modes/text-combine-upright-decorations-001.ht
== css-writing-modes/text-combine-upright-inherit-all-002.html css-writing-modes/reference/text-combine-upright-inherit-all-002.html
== css-writing-modes/text-combine-upright-layout-rules-001.html css-writing-modes/reference/text-combine-upright-layout-rules-001-ref.html
== css-writing-modes/text-combine-upright-line-breaking-rules-001.html css-writing-modes/text-combine-upright-line-breaking-rules-001-ref.html
fuzzy(255,960) random-if(webrender) == css-writing-modes/text-combine-upright-value-all-001.html css-writing-modes/reference/text-combine-upright-value-single-character.html
fuzzy(255,960) random-if(webrender) == css-writing-modes/text-combine-upright-value-all-002.html css-writing-modes/reference/vertical-ahem-1x1-ref.html
fuzzy(255,960) random-if(webrender) != css-writing-modes/text-combine-upright-value-all-002.html css-writing-modes/reference/horizontal-ahem-1x1-notref.html
fuzzy(255,960) random-if(webrender) == css-writing-modes/text-combine-upright-value-all-003.html css-writing-modes/reference/vertical-ahem-1x1-ref.html
fuzzy(255,960) random-if(webrender) != css-writing-modes/text-combine-upright-value-all-003.html css-writing-modes/reference/horizontal-ahem-1x1-notref.html
fuzzy(255,960) == css-writing-modes/text-combine-upright-value-all-001.html css-writing-modes/reference/text-combine-upright-value-single-character.html
fuzzy(255,960) fails-if(webrender) == css-writing-modes/text-combine-upright-value-all-002.html css-writing-modes/reference/vertical-ahem-1x1-ref.html
fuzzy(255,960) != css-writing-modes/text-combine-upright-value-all-002.html css-writing-modes/reference/horizontal-ahem-1x1-notref.html
fuzzy(255,960) fails-if(webrender) == css-writing-modes/text-combine-upright-value-all-003.html css-writing-modes/reference/vertical-ahem-1x1-ref.html
fuzzy(255,960) != css-writing-modes/text-combine-upright-value-all-003.html css-writing-modes/reference/horizontal-ahem-1x1-notref.html
skip == css-writing-modes/text-combine-upright-value-digits2-001.html css-writing-modes/reference/text-combine-upright-value-single-character.html
skip == css-writing-modes/text-combine-upright-value-digits2-002.html css-writing-modes/reference/vertical-ahem-1x1-ref.html
skip != css-writing-modes/text-combine-upright-value-digits2-002.html css-writing-modes/reference/horizontal-ahem-1x1-notref.html