Bug 1430939 - Part1:Update directory names in import-tests.py and failures.list to match names in w3c/web-platform-tests. r=dholbert
authorNeerja Pancholi <npancholi@mozilla.com>
Wed, 17 Jan 2018 13:43:02 -0800
changeset 454251 86576ceab319e4954a5f9a5e22a7dc0479b35ac6
parent 454250 0739354fe0d3338a36df2f5ec6d64a8850e711e7
child 454252 6c200b73f15df4c1038ded120eafda67acf05b21
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs1430939
milestone59.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 1430939 - Part1:Update directory names in import-tests.py and failures.list to match names in w3c/web-platform-tests. r=dholbert MozReview-Commit-ID: 7y9LariD9e8
layout/reftests/w3c-css/failures.list
layout/reftests/w3c-css/import-tests.py
--- a/layout/reftests/w3c-css/failures.list
+++ b/layout/reftests/w3c-css/failures.list
@@ -1,315 +1,315 @@
 # LIST OF REFTEST FAILURES FROM IMPORTS
 #
 # The syntax of this file is as follows:
 #    1) All lines marked with a '#' are comments.
 #    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.:
-#       fails css-values-3/attr-*.html
+#       fails css-values/attr-*.html
 #
 # If a test matches multiple path pattern, the last one wins. Because
 # of this, an item could have zero <failure-type>, which indicates it
 # is expected to pass, and override failure rule above it.
 
 
 #### Selectors 4 ####################################################
 
 # focus-within
-needs-focus selectors4/focus-within-0??.html
+needs-focus selectors/focus-within-0??.html
 
 # Rely on Element.attachShadow which is not implemented yet
-skip selectors4/focus-within-shadow-*.html
+skip selectors/focus-within-shadow-*.html
 
 #### CSS Values 3 ####################################################
 
 # New failures need to be triged later
-fails css-values-3/ch-unit-003.html
+fails css-values/ch-unit-003.html
 
 # Fuzzy
-fuzzy-if(OSX||Android,78,197) css-values-3/ch-unit-001.html
-fuzzy(50,160) css-values-3/ch-unit-002.html
-fuzzy(78,197) css-values-3/ch-unit-004.html
+fuzzy-if(OSX||Android,78,197) css-values/ch-unit-001.html
+fuzzy(50,160) css-values/ch-unit-002.html
+fuzzy(78,197) css-values/ch-unit-004.html
 
 # Bug 435426
-fails css-values-3/attr-*.html
-      css-values-3/attr-*-invalid-fallback.html
-      css-values-3/attr-invalid-type-???.html
+fails css-values/attr-*.html
+      css-values/attr-*-invalid-fallback.html
+      css-values/attr-invalid-type-???.html
 
 # Bug 1256575
-fails-if(!stylo) css-values-3/calc-in-media-queries-???.html
+fails-if(!stylo) css-values/calc-in-media-queries-???.html
 
 # because of dynamic change
-skip css-values-3/vh_not_refreshing_on_chrome.html
-skip css-values-3/vh_not_refreshing_on_chrome_iframe.html
+skip css-values/vh_not_refreshing_on_chrome.html
+skip css-values/vh_not_refreshing_on_chrome_iframe.html
 
 # because of support files (in iframe subdir) not being copied (bug 1256580)
-skip css-values-3/vh-support-transform-origin.html
-skip css-values-3/vh-support-transform-translate.html
+skip css-values/vh-support-transform-origin.html
+skip css-values/vh-support-transform-translate.html
 
-css-values-3/calc-in-calc.html
+css-values/calc-in-calc.html
 
 #### CSS Writing Modes 3 #############################################
 
 # New failures need to be triged later
-fails css-writing-modes-3/float-lft-orthog-htb-in-vlr-002.xht
-fails css-writing-modes-3/float-lft-orthog-htb-in-vrl-002.xht
-fails css-writing-modes-3/float-lft-orthog-vlr-in-htb-002.xht
-fails css-writing-modes-3/float-lft-orthog-vrl-in-htb-002.xht
-fails css-writing-modes-3/float-rgt-orthog-htb-in-vlr-003.xht
-fails css-writing-modes-3/float-rgt-orthog-htb-in-vrl-003.xht
-fails css-writing-modes-3/float-rgt-orthog-vlr-in-htb-003.xht
-fails css-writing-modes-3/float-rgt-orthog-vrl-in-htb-003.xht
-fails css-writing-modes-3/sizing-orthog-htb-in-vrl-001.xht
-fails css-writing-modes-3/sizing-orthog-htb-in-vrl-004.xht
-fails css-writing-modes-3/sizing-orthog-htb-in-vrl-013.xht
-fails-if(OSX||winWidget) css-writing-modes-3/sizing-orthog-htb-in-vlr-008.xht
-fails-if(OSX||winWidget) css-writing-modes-3/sizing-orthog-htb-in-vlr-020.xht
-fails-if(OSX||winWidget) css-writing-modes-3/sizing-orthog-htb-in-vrl-008.xht
-fails-if(OSX||winWidget) css-writing-modes-3/sizing-orthog-htb-in-vrl-020.xht
-css-writing-modes-3/sizing-orthog-vlr-in-htb-008.xht
-css-writing-modes-3/sizing-orthog-vlr-in-htb-020.xht
-css-writing-modes-3/sizing-orthog-vrl-in-htb-008.xht
-css-writing-modes-3/sizing-orthog-vrl-in-htb-020.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-htb-in-vlr-003.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-htb-in-vlr-009.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-htb-in-vlr-015.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-htb-in-vlr-021.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-htb-in-vrl-003.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-htb-in-vrl-009.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-htb-in-vrl-015.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-htb-in-vrl-021.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-vlr-in-htb-003.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-vlr-in-htb-009.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-vlr-in-htb-015.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-vlr-in-htb-021.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-vrl-in-htb-003.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-vrl-in-htb-009.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-vrl-in-htb-015.xht
-fails-if(Android) css-writing-modes-3/sizing-orthog-vrl-in-htb-021.xht
+fails css-writing-modes/float-lft-orthog-htb-in-vlr-002.xht
+fails css-writing-modes/float-lft-orthog-htb-in-vrl-002.xht
+fails css-writing-modes/float-lft-orthog-vlr-in-htb-002.xht
+fails css-writing-modes/float-lft-orthog-vrl-in-htb-002.xht
+fails css-writing-modes/float-rgt-orthog-htb-in-vlr-003.xht
+fails css-writing-modes/float-rgt-orthog-htb-in-vrl-003.xht
+fails css-writing-modes/float-rgt-orthog-vlr-in-htb-003.xht
+fails css-writing-modes/float-rgt-orthog-vrl-in-htb-003.xht
+fails css-writing-modes/sizing-orthog-htb-in-vrl-001.xht
+fails css-writing-modes/sizing-orthog-htb-in-vrl-004.xht
+fails css-writing-modes/sizing-orthog-htb-in-vrl-013.xht
+fails-if(OSX||winWidget) css-writing-modes/sizing-orthog-htb-in-vlr-008.xht
+fails-if(OSX||winWidget) css-writing-modes/sizing-orthog-htb-in-vlr-020.xht
+fails-if(OSX||winWidget) css-writing-modes/sizing-orthog-htb-in-vrl-008.xht
+fails-if(OSX||winWidget) css-writing-modes/sizing-orthog-htb-in-vrl-020.xht
+css-writing-modes/sizing-orthog-vlr-in-htb-008.xht
+css-writing-modes/sizing-orthog-vlr-in-htb-020.xht
+css-writing-modes/sizing-orthog-vrl-in-htb-008.xht
+css-writing-modes/sizing-orthog-vrl-in-htb-020.xht
+fails-if(Android) css-writing-modes/sizing-orthog-htb-in-vlr-003.xht
+fails-if(Android) css-writing-modes/sizing-orthog-htb-in-vlr-009.xht
+fails-if(Android) css-writing-modes/sizing-orthog-htb-in-vlr-015.xht
+fails-if(Android) css-writing-modes/sizing-orthog-htb-in-vlr-021.xht
+fails-if(Android) css-writing-modes/sizing-orthog-htb-in-vrl-003.xht
+fails-if(Android) css-writing-modes/sizing-orthog-htb-in-vrl-009.xht
+fails-if(Android) css-writing-modes/sizing-orthog-htb-in-vrl-015.xht
+fails-if(Android) css-writing-modes/sizing-orthog-htb-in-vrl-021.xht
+fails-if(Android) css-writing-modes/sizing-orthog-vlr-in-htb-003.xht
+fails-if(Android) css-writing-modes/sizing-orthog-vlr-in-htb-009.xht
+fails-if(Android) css-writing-modes/sizing-orthog-vlr-in-htb-015.xht
+fails-if(Android) css-writing-modes/sizing-orthog-vlr-in-htb-021.xht
+fails-if(Android) css-writing-modes/sizing-orthog-vrl-in-htb-003.xht
+fails-if(Android) css-writing-modes/sizing-orthog-vrl-in-htb-009.xht
+fails-if(Android) css-writing-modes/sizing-orthog-vrl-in-htb-015.xht
+fails-if(Android) css-writing-modes/sizing-orthog-vrl-in-htb-021.xht
 
 # Fuzzy
-fuzzy-if(OSX||winWidget,255,480)  css-writing-modes-3/abs-pos-non-replaced-v??-???.xht
-fuzzy-if(OSX||winWidget,93,600)   css-writing-modes-3/baseline-inline-non-replaced-00?.xht
-fuzzy-if(OSX||winWidget,213,1540) css-writing-modes-3/block-flow-direction-???-0??.xht
-fuzzy-if(OSX,255,200)  css-writing-modes-3/box-offsets-rel-pos-vlr-005.xht
-fuzzy-if(OSX,255,200)  css-writing-modes-3/box-offsets-rel-pos-vrl-004.xht
-fuzzy-if(OSX||winWidget,93,300)   css-writing-modes-3/caption-side-v??-00?.xht
-fuzzy-if(OSX||winWidget,215,780)  css-writing-modes-3/central-baseline-alignment-00?.xht
-fuzzy-if(OSX||winWidget,75,404)   css-writing-modes-3/direction-v??-00?.xht
-fuzzy-if(OSX||winWidget,135,902)  css-writing-modes-3/float-contiguous-v??-01?.xht
-fuzzy-if(OSX||winWidget,93,300)   css-writing-modes-3/float-shrink-to-fit-vlr-009.xht
-fuzzy-if(OSX||winWidget,93,300)   css-writing-modes-3/float-shrink-to-fit-vrl-008.xht
-fuzzy-if(OSX||winWidget,93,300)   css-writing-modes-3/float-v??-0??.xht
-fuzzy-if(OSX||winWidget,62,404)   css-writing-modes-3/height-width-inline-non-replaced-v??-00?.xht
-fuzzy-if(OSX||winWidget,218,621)  css-writing-modes-3/inline-block-alignment-orthogonal-v??-00?.xht
-fuzzy-if(OSX||winWidget,135,1080) css-writing-modes-3/inline-block-alignment-slr-009.xht
-fuzzy-if(OSX||winWidget,111,960)  css-writing-modes-3/inline-block-alignment-srl-008.xht
-fuzzy-if(OSX||winWidget,213,1540) css-writing-modes-3/line-box-direction-???-0??.xht
-fuzzy-if(OSX||winWidget,110,1200) css-writing-modes-3/row-progression-???-0??.xht
-fuzzy-if(OSX||winWidget,110,1200) css-writing-modes-3/table-column-order-00?.xht
-fuzzy-if(winWidget,110,1200) css-writing-modes-3/table-column-order-slr-007.xht
-fuzzy-if(OSX||winWidget,110,1200) css-writing-modes-3/table-column-order-srl-006.xht
-fuzzy-if(OSX||winWidget,75,404)   css-writing-modes-3/text-align-v??-0??.xht
-fuzzy-if(OSX||winWidget,215,780)  css-writing-modes-3/text-baseline-???-00?.xht
-fuzzy-if(OSX,15,16) css-writing-modes-3/text-combine-upright-decorations-001.html
-fuzzy-if(OSX||winWidget,255,480)  css-writing-modes-3/text-indent-v??-0??.xht
-fuzzy-if(OSX||winWidget,226,960)  css-writing-modes-3/text-orientation-016.xht
-fuzzy-if(OSX||winWidget,223,720)  css-writing-modes-3/vertical-alignment-*.xht
-fuzzy-if(OSX||winWidget,153,612)  css-writing-modes-3/writing-mode-vertical-??-00?.*
-fuzzy(255,960) random-if(webrender) css-writing-modes-3/text-combine-upright-value-all-00?.html
+fuzzy-if(OSX||winWidget,255,480)  css-writing-modes/abs-pos-non-replaced-v??-???.xht
+fuzzy-if(OSX||winWidget,93,600)   css-writing-modes/baseline-inline-non-replaced-00?.xht
+fuzzy-if(OSX||winWidget,213,1540) css-writing-modes/block-flow-direction-???-0??.xht
+fuzzy-if(OSX,255,200)  css-writing-modes/box-offsets-rel-pos-vlr-005.xht
+fuzzy-if(OSX,255,200)  css-writing-modes/box-offsets-rel-pos-vrl-004.xht
+fuzzy-if(OSX||winWidget,93,300)   css-writing-modes/caption-side-v??-00?.xht
+fuzzy-if(OSX||winWidget,215,780)  css-writing-modes/central-baseline-alignment-00?.xht
+fuzzy-if(OSX||winWidget,75,404)   css-writing-modes/direction-v??-00?.xht
+fuzzy-if(OSX||winWidget,135,902)  css-writing-modes/float-contiguous-v??-01?.xht
+fuzzy-if(OSX||winWidget,93,300)   css-writing-modes/float-shrink-to-fit-vlr-009.xht
+fuzzy-if(OSX||winWidget,93,300)   css-writing-modes/float-shrink-to-fit-vrl-008.xht
+fuzzy-if(OSX||winWidget,93,300)   css-writing-modes/float-v??-0??.xht
+fuzzy-if(OSX||winWidget,62,404)   css-writing-modes/height-width-inline-non-replaced-v??-00?.xht
+fuzzy-if(OSX||winWidget,218,621)  css-writing-modes/inline-block-alignment-orthogonal-v??-00?.xht
+fuzzy-if(OSX||winWidget,135,1080) css-writing-modes/inline-block-alignment-slr-009.xht
+fuzzy-if(OSX||winWidget,111,960)  css-writing-modes/inline-block-alignment-srl-008.xht
+fuzzy-if(OSX||winWidget,213,1540) css-writing-modes/line-box-direction-???-0??.xht
+fuzzy-if(OSX||winWidget,110,1200) css-writing-modes/row-progression-???-0??.xht
+fuzzy-if(OSX||winWidget,110,1200) css-writing-modes/table-column-order-00?.xht
+fuzzy-if(winWidget,110,1200) css-writing-modes/table-column-order-slr-007.xht
+fuzzy-if(OSX||winWidget,110,1200) css-writing-modes/table-column-order-srl-006.xht
+fuzzy-if(OSX||winWidget,75,404)   css-writing-modes/text-align-v??-0??.xht
+fuzzy-if(OSX||winWidget,215,780)  css-writing-modes/text-baseline-???-00?.xht
+fuzzy-if(OSX,15,16) css-writing-modes/text-combine-upright-decorations-001.html
+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
 
 # Bug 1167911
-skip css-writing-modes-3/abs-pos-non-replaced-icb-vlr-021.xht
-skip css-writing-modes-3/abs-pos-non-replaced-icb-vrl-020.xht
+skip css-writing-modes/abs-pos-non-replaced-icb-vlr-021.xht
+skip css-writing-modes/abs-pos-non-replaced-icb-vrl-020.xht
 
 # Bug 1244601
-fails css-writing-modes-3/block-flow-direction-slr-058.xht
-fails css-writing-modes-3/block-flow-direction-srl-057.xht
-fails css-writing-modes-3/block-flow-direction-vlr-018.xht
-fails css-writing-modes-3/block-flow-direction-vrl-017.xht
+fails css-writing-modes/block-flow-direction-slr-058.xht
+fails css-writing-modes/block-flow-direction-srl-057.xht
+fails css-writing-modes/block-flow-direction-vlr-018.xht
+fails css-writing-modes/block-flow-direction-vrl-017.xht
 
 # Bug 1185430
-fails css-writing-modes-3/contiguous-floated-table-vlr-00?.xht
-fails css-writing-modes-3/contiguous-floated-table-vrl-00?.xht
-fails css-writing-modes-3/table-progression-slr-002.html
-fails css-writing-modes-3/table-progression-srl-002.html
-fails css-writing-modes-3/table-progression-vlr-00?.html
-      css-writing-modes-3/table-progression-vlr-001.html
-fails css-writing-modes-3/table-progression-vrl-00?.html
-      css-writing-modes-3/table-progression-vrl-001.html
+fails css-writing-modes/contiguous-floated-table-vlr-00?.xht
+fails css-writing-modes/contiguous-floated-table-vrl-00?.xht
+fails css-writing-modes/table-progression-slr-002.html
+fails css-writing-modes/table-progression-srl-002.html
+fails css-writing-modes/table-progression-vlr-00?.html
+      css-writing-modes/table-progression-vlr-001.html
+fails css-writing-modes/table-progression-vrl-00?.html
+      css-writing-modes/table-progression-vrl-001.html
 
-fails css-writing-modes-3/flexbox_align-items-stretch-writing-modes.html
+fails css-writing-modes/flexbox_align-items-stretch-writing-modes.html
 
 # Bug 1179952
-fails css-writing-modes-3/inline-block-alignment-00?.xht
-fuzzy-if(OSX||winWidget,111,960) css-writing-modes-3/inline-block-alignment-006.xht
-fails css-writing-modes-3/inline-table-alignment-00?.xht
+fails css-writing-modes/inline-block-alignment-00?.xht
+fuzzy-if(OSX||winWidget,111,960) css-writing-modes/inline-block-alignment-006.xht
+fails css-writing-modes/inline-table-alignment-00?.xht
 
 # Bug 1227616
-random css-writing-modes-3/line-box-direction-slr-056.xht
-random css-writing-modes-3/line-box-direction-srl-055.xht
-random css-writing-modes-3/line-box-direction-vlr-016.xht
-random css-writing-modes-3/line-box-direction-vrl-015.xht
+random css-writing-modes/line-box-direction-slr-056.xht
+random css-writing-modes/line-box-direction-srl-055.xht
+random css-writing-modes/line-box-direction-vlr-016.xht
+random css-writing-modes/line-box-direction-vrl-015.xht
 
 # Bug 1220352
-fails css-writing-modes-3/line-box-height-vlr-003.xht
-fails css-writing-modes-3/line-box-height-vlr-005.xht
-fails css-writing-modes-3/line-box-height-vlr-011.xht
-fails css-writing-modes-3/line-box-height-vlr-013.xht
-fails css-writing-modes-3/line-box-height-vlr-021.xht
-fails css-writing-modes-3/line-box-height-vlr-023.xht
-fails css-writing-modes-3/line-box-height-vrl-002.xht
-fails css-writing-modes-3/line-box-height-vrl-004.xht
-fails css-writing-modes-3/line-box-height-vrl-010.xht
-fails css-writing-modes-3/line-box-height-vrl-012.xht
+fails css-writing-modes/line-box-height-vlr-003.xht
+fails css-writing-modes/line-box-height-vlr-005.xht
+fails css-writing-modes/line-box-height-vlr-011.xht
+fails css-writing-modes/line-box-height-vlr-013.xht
+fails css-writing-modes/line-box-height-vlr-021.xht
+fails css-writing-modes/line-box-height-vlr-023.xht
+fails css-writing-modes/line-box-height-vrl-002.xht
+fails css-writing-modes/line-box-height-vrl-004.xht
+fails css-writing-modes/line-box-height-vrl-010.xht
+fails css-writing-modes/line-box-height-vrl-012.xht
 
 # Bug 1258635 - text-combine-upright: digits
 # Using skip because there are mismatch tests which would unexpectedly
 # pass with "fails-if(!stylo)".
-skip css-writing-modes-3/full-width-003.html
-skip css-writing-modes-3/text-combine-upright-value-digits?-001.html
-skip css-writing-modes-3/text-combine-upright-value-digits?-002.html
+skip css-writing-modes/full-width-003.html
+skip css-writing-modes/text-combine-upright-value-digits?-001.html
+skip css-writing-modes/text-combine-upright-value-digits?-002.html
 
 # Bug 1220353
-fails css-writing-modes-3/vertical-alignment-vlr-023.xht
-fails css-writing-modes-3/vertical-alignment-vlr-025.xht
-fails css-writing-modes-3/vertical-alignment-vrl-022.xht
-fails css-writing-modes-3/vertical-alignment-vrl-024.xht
+fails css-writing-modes/vertical-alignment-vlr-023.xht
+fails css-writing-modes/vertical-alignment-vlr-025.xht
+fails css-writing-modes/vertical-alignment-vrl-022.xht
+fails css-writing-modes/vertical-alignment-vrl-024.xht
 
 # Bug 1102175
-fails css-writing-modes-3/wm-propagation-body-*.xht
+fails css-writing-modes/wm-propagation-body-*.xht
 
-css-writing-modes-3/text-combine-upright-layout-rules-001.html
+css-writing-modes/text-combine-upright-layout-rules-001.html
 
 #### CSS Multi-column 1 ##############################################
 
 # Fuzzy annotations for multicol tests are due to AA differences.
 # fails-if(!stylo) annotations need to be triaged later. (Bug 1299006)
-fails-if(winWidget||OSX) css-multicol-1/multicol-block-no-clip-001.xht
-fails-if(winWidget||OSX) css-multicol-1/multicol-block-no-clip-002.xht
-fails css-multicol-1/multicol-br-inside-avoidcolumn-001.xht
-fails css-multicol-1/multicol-break-000.xht
-fails css-multicol-1/multicol-break-001.xht
-fuzzy(135,1008) css-multicol-1/multicol-clip-001.xht
-fuzzy(135,770) css-multicol-1/multicol-clip-002.xht
-fuzzy(135,467) css-multicol-1/multicol-collapsing-001.xht
-fuzzy(87,180) css-multicol-1/multicol-columns-001.xht
-fuzzy(87,180) css-multicol-1/multicol-columns-002.xht
-fuzzy(87,180) css-multicol-1/multicol-columns-003.xht
-fuzzy(87,180) css-multicol-1/multicol-columns-004.xht
-fuzzy(87,180) css-multicol-1/multicol-columns-005.xht
-fuzzy(87,180) css-multicol-1/multicol-columns-006.xht
-fuzzy(87,180) css-multicol-1/multicol-columns-007.xht
-fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol-1/multicol-columns-invalid-001.xht
-fails-if(OSX||winWidget) css-multicol-1/multicol-columns-invalid-002.xht
-fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol-1/multicol-columns-toolong-001.xht
-fuzzy(135,530) css-multicol-1/multicol-containing-001.xht
-fuzzy(215,241) css-multicol-1/multicol-containing-002.xht
-fuzzy(87,180) css-multicol-1/multicol-count-001.xht
-fails css-multicol-1/multicol-count-002.xht
-fails css-multicol-1/multicol-count-computed-001.xht
-fails css-multicol-1/multicol-count-computed-002.xht
-fails-if(winWidget||OSX||Android) css-multicol-1/multicol-count-computed-003.xht
-fuzzy-if(winWidget||OSX||gtkWidget,112,861) fails-if(Android) css-multicol-1/multicol-count-computed-004.xht
-fails-if(winWidget||OSX||Android) css-multicol-1/multicol-count-computed-005.xht
-fails css-multicol-1/multicol-count-large-001.xht
-fuzzy(255,132) css-multicol-1/multicol-count-large-002.xht
-fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol-1/multicol-count-negative-001.xht
-fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol-1/multicol-count-negative-002.xht
-fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol-1/multicol-count-non-integer-001.xht
-fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol-1/multicol-count-non-integer-002.xht
-fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol-1/multicol-count-non-integer-003.xht
-fuzzy(135,80) css-multicol-1/multicol-fill-auto-002.xht
-fuzzy(135,3270) css-multicol-1/multicol-fill-auto-003.xht
-fails css-multicol-1/multicol-fill-auto.xht
-fuzzy(135,80) css-multicol-1/multicol-fill-balance-001.xht
-fuzzy(135,821) css-multicol-1/multicol-gap-000.xht
-fuzzy(255,290) css-multicol-1/multicol-gap-001.xht
-fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol-1/multicol-gap-002.xht
-fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol-1/multicol-gap-003.xht
-fuzzy(107,1823) css-multicol-1/multicol-gap-fraction-001.xht
-fuzzy-if(winWidget||OSX||gtkWidget,204,1048) fuzzy-if(skiaContent,208,1048) fails-if(Android) css-multicol-1/multicol-gap-large-001.xht
-fuzzy(225,920) css-multicol-1/multicol-gap-large-002.xht
-fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol-1/multicol-gap-negative-001.xht
-fails css-multicol-1/multicol-height-block-child-001.xht
-fuzzy(255,3762) css-multicol-1/multicol-inherit-001.xht
-fuzzy(135,1893) css-multicol-1/multicol-inherit-002.xht
-fails css-multicol-1/multicol-inherit-003.xht
-fails css-multicol-1/multicol-inherit-004.xht
-fuzzy(96,264) css-multicol-1/multicol-list-item-001.xht
-fuzzy(73,1200) css-multicol-1/multicol-margin-001.xht
-fuzzy(73,1200) css-multicol-1/multicol-margin-002.xht
-fuzzy(243,3322) fuzzy-if(skiaContent,244,3322) css-multicol-1/multicol-margin-child-001.xht
-fuzzy(255,4008) css-multicol-1/multicol-nested-002.xht
-fuzzy(255,4109) css-multicol-1/multicol-nested-005.xht
-fuzzy(204,2463) fuzzy-if(skiaContent,208,2463) css-multicol-1/multicol-nested-margin-001.xht
-fails-if(OSX||winWidget) css-multicol-1/multicol-nested-margin-002.xht
-fuzzy(204,2371) fuzzy-if(skiaContent,208,2371) css-multicol-1/multicol-nested-margin-003.xht
-fuzzy(225,2529) css-multicol-1/multicol-nested-margin-004.xht
-fuzzy(225,2529) css-multicol-1/multicol-nested-margin-005.xht
-fuzzy(135,142) css-multicol-1/multicol-overflow-000.xht
-fuzzy(204,1844) fuzzy-if(skiaContent,208,1844) css-multicol-1/multicol-overflowing-001.xht
-fuzzy-if(OSX,61,2) fuzzy-if(skiaContent,64,2) css-multicol-1/multicol-reduce-000.xht
-fuzzy-if(OSX,8,20) css-multicol-1/multicol-rule-000.xht
-fuzzy(135,1584) css-multicol-1/multicol-rule-001.xht
-fails css-multicol-1/multicol-rule-002.xht
-fails-if(OSX||winWidget) css-multicol-1/multicol-rule-003.xht
-fails-if(OSX||winWidget) css-multicol-1/multicol-rule-color-001.xht
-fuzzy(106,354) css-multicol-1/multicol-rule-dashed-000.xht
-fuzzy(106,354) css-multicol-1/multicol-rule-dotted-000.xht
-fuzzy(106,354) css-multicol-1/multicol-rule-double-000.xht
-fails-if(OSX||winWidget) css-multicol-1/multicol-rule-fraction-001.xht
-fails-if(OSX||winWidget) css-multicol-1/multicol-rule-fraction-002.xht
-fails css-multicol-1/multicol-rule-fraction-003.xht
-fuzzy(127,500) css-multicol-1/multicol-rule-groove-000.xht
-fuzzy(94,256) css-multicol-1/multicol-rule-hidden-000.xht
-fuzzy(127,500) css-multicol-1/multicol-rule-inset-000.xht
-fuzzy(127,500) css-multicol-1/multicol-rule-outset-000.xht
-fails css-multicol-1/multicol-rule-px-001.xht
-fuzzy(127,500) css-multicol-1/multicol-rule-ridge-000.xht
-fuzzy(106,354) css-multicol-1/multicol-rule-solid-000.xht
-fails css-multicol-1/multicol-rule-stacking-001.xht
-css-multicol-1/multicol-rule-style-groove-001.xht
-css-multicol-1/multicol-rule-style-inset-001.xht
-css-multicol-1/multicol-rule-style-outset-001.xht
-css-multicol-1/multicol-rule-style-ridge-001.xht
-fails css-multicol-1/multicol-shorthand-001.xht
-fails css-multicol-1/multicol-span-000.xht
-fails css-multicol-1/multicol-span-all-001.xht
-fails css-multicol-1/multicol-span-all-002.xht
-fails css-multicol-1/multicol-span-all-003.xht
-fails css-multicol-1/multicol-span-all-child-001.xht
-fails-if(OSX||winWidget) css-multicol-1/multicol-span-all-child-002.xht
-fails css-multicol-1/multicol-span-all-margin-001.xht
-fails css-multicol-1/multicol-span-all-margin-002.xht
-fails css-multicol-1/multicol-span-all-margin-bottom-001.xht
-fails css-multicol-1/multicol-span-all-margin-nested-001.xht
-fails css-multicol-1/multicol-span-all-margin-nested-002.xht
-fails css-multicol-1/multicol-span-all-margin-nested-003.xht
-fails css-multicol-1/multicol-span-all-margin-nested-firstchild-001.xht
-fails css-multicol-1/multicol-span-float-001.xht
-fails css-multicol-1/multicol-span-none-001.xht
-fails css-multicol-1/multicol-table-cell-001.xht
-fails css-multicol-1/multicol-table-cell-height-001.xht
-fails css-multicol-1/multicol-table-cell-height-002.xht
-fails css-multicol-1/multicol-table-cell-vertical-align-001.xht
-fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol-1/multicol-width-002.xht
-fails css-multicol-1/multicol-width-count-002.xht
-fails css-multicol-1/multicol-width-ems-001.xht
-fails css-multicol-1/multicol-width-negative-001.xht
-fuzzy(225,1060) css-multicol-1/multicol-width-large-001.xht
-fails css-multicol-1/multicol-width-small-001.xht
-fuzzy(225,1060) css-multicol-1/multicol-width-invalid-001.xht
-fuzzy(225,1060) css-multicol-1/multicol-width-large-002.xht
-fails css-multicol-1/multicol-zero-height-001.xht
-fuzzy(225,13600) css-multicol-1/multicol-nested-column-rule-001.xht
-fuzzy(94,256) css-multicol-1/multicol-rule-none-000.xht
+fails-if(winWidget||OSX) css-multicol/multicol-block-no-clip-001.xht
+fails-if(winWidget||OSX) css-multicol/multicol-block-no-clip-002.xht
+fails css-multicol/multicol-br-inside-avoidcolumn-001.xht
+fails css-multicol/multicol-break-000.xht
+fails css-multicol/multicol-break-001.xht
+fuzzy(135,1008) css-multicol/multicol-clip-001.xht
+fuzzy(135,770) css-multicol/multicol-clip-002.xht
+fuzzy(135,467) css-multicol/multicol-collapsing-001.xht
+fuzzy(87,180) css-multicol/multicol-columns-001.xht
+fuzzy(87,180) css-multicol/multicol-columns-002.xht
+fuzzy(87,180) css-multicol/multicol-columns-003.xht
+fuzzy(87,180) css-multicol/multicol-columns-004.xht
+fuzzy(87,180) css-multicol/multicol-columns-005.xht
+fuzzy(87,180) css-multicol/multicol-columns-006.xht
+fuzzy(87,180) css-multicol/multicol-columns-007.xht
+fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol/multicol-columns-invalid-001.xht
+fails-if(OSX||winWidget) css-multicol/multicol-columns-invalid-002.xht
+fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol/multicol-columns-toolong-001.xht
+fuzzy(135,530) css-multicol/multicol-containing-001.xht
+fuzzy(215,241) css-multicol/multicol-containing-002.xht
+fuzzy(87,180) css-multicol/multicol-count-001.xht
+fails css-multicol/multicol-count-002.xht
+fails css-multicol/multicol-count-computed-001.xht
+fails css-multicol/multicol-count-computed-002.xht
+fails-if(winWidget||OSX||Android) css-multicol/multicol-count-computed-003.xht
+fuzzy-if(winWidget||OSX||gtkWidget,112,861) fails-if(Android) css-multicol/multicol-count-computed-004.xht
+fails-if(winWidget||OSX||Android) css-multicol/multicol-count-computed-005.xht
+fails css-multicol/multicol-count-large-001.xht
+fuzzy(255,132) css-multicol/multicol-count-large-002.xht
+fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol/multicol-count-negative-001.xht
+fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol/multicol-count-negative-002.xht
+fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol/multicol-count-non-integer-001.xht
+fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol/multicol-count-non-integer-002.xht
+fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol/multicol-count-non-integer-003.xht
+fuzzy(135,80) css-multicol/multicol-fill-auto-002.xht
+fuzzy(135,3270) css-multicol/multicol-fill-auto-003.xht
+fails css-multicol/multicol-fill-auto.xht
+fuzzy(135,80) css-multicol/multicol-fill-balance-001.xht
+fuzzy(135,821) css-multicol/multicol-gap-000.xht
+fuzzy(255,290) css-multicol/multicol-gap-001.xht
+fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol/multicol-gap-002.xht
+fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol/multicol-gap-003.xht
+fuzzy(107,1823) css-multicol/multicol-gap-fraction-001.xht
+fuzzy-if(winWidget||OSX||gtkWidget,204,1048) fuzzy-if(skiaContent,208,1048) fails-if(Android) css-multicol/multicol-gap-large-001.xht
+fuzzy(225,920) css-multicol/multicol-gap-large-002.xht
+fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol/multicol-gap-negative-001.xht
+fails css-multicol/multicol-height-block-child-001.xht
+fuzzy(255,3762) css-multicol/multicol-inherit-001.xht
+fuzzy(135,1893) css-multicol/multicol-inherit-002.xht
+fails css-multicol/multicol-inherit-003.xht
+fails css-multicol/multicol-inherit-004.xht
+fuzzy(96,264) css-multicol/multicol-list-item-001.xht
+fuzzy(73,1200) css-multicol/multicol-margin-001.xht
+fuzzy(73,1200) css-multicol/multicol-margin-002.xht
+fuzzy(243,3322) fuzzy-if(skiaContent,244,3322) css-multicol/multicol-margin-child-001.xht
+fuzzy(255,4008) css-multicol/multicol-nested-002.xht
+fuzzy(255,4109) css-multicol/multicol-nested-005.xht
+fuzzy(204,2463) fuzzy-if(skiaContent,208,2463) css-multicol/multicol-nested-margin-001.xht
+fails-if(OSX||winWidget) css-multicol/multicol-nested-margin-002.xht
+fuzzy(204,2371) fuzzy-if(skiaContent,208,2371) css-multicol/multicol-nested-margin-003.xht
+fuzzy(225,2529) css-multicol/multicol-nested-margin-004.xht
+fuzzy(225,2529) css-multicol/multicol-nested-margin-005.xht
+fuzzy(135,142) css-multicol/multicol-overflow-000.xht
+fuzzy(204,1844) fuzzy-if(skiaContent,208,1844) css-multicol/multicol-overflowing-001.xht
+fuzzy-if(OSX,61,2) fuzzy-if(skiaContent,64,2) css-multicol/multicol-reduce-000.xht
+fuzzy-if(OSX,8,20) css-multicol/multicol-rule-000.xht
+fuzzy(135,1584) css-multicol/multicol-rule-001.xht
+fails css-multicol/multicol-rule-002.xht
+fails-if(OSX||winWidget) css-multicol/multicol-rule-003.xht
+fails-if(OSX||winWidget) css-multicol/multicol-rule-color-001.xht
+fuzzy(106,354) css-multicol/multicol-rule-dashed-000.xht
+fuzzy(106,354) css-multicol/multicol-rule-dotted-000.xht
+fuzzy(106,354) css-multicol/multicol-rule-double-000.xht
+fails-if(OSX||winWidget) css-multicol/multicol-rule-fraction-001.xht
+fails-if(OSX||winWidget) css-multicol/multicol-rule-fraction-002.xht
+fails css-multicol/multicol-rule-fraction-003.xht
+fuzzy(127,500) css-multicol/multicol-rule-groove-000.xht
+fuzzy(94,256) css-multicol/multicol-rule-hidden-000.xht
+fuzzy(127,500) css-multicol/multicol-rule-inset-000.xht
+fuzzy(127,500) css-multicol/multicol-rule-outset-000.xht
+fails css-multicol/multicol-rule-px-001.xht
+fuzzy(127,500) css-multicol/multicol-rule-ridge-000.xht
+fuzzy(106,354) css-multicol/multicol-rule-solid-000.xht
+fails css-multicol/multicol-rule-stacking-001.xht
+css-multicol/multicol-rule-style-groove-001.xht
+css-multicol/multicol-rule-style-inset-001.xht
+css-multicol/multicol-rule-style-outset-001.xht
+css-multicol/multicol-rule-style-ridge-001.xht
+fails css-multicol/multicol-shorthand-001.xht
+fails css-multicol/multicol-span-000.xht
+fails css-multicol/multicol-span-all-001.xht
+fails css-multicol/multicol-span-all-002.xht
+fails css-multicol/multicol-span-all-003.xht
+fails css-multicol/multicol-span-all-child-001.xht
+fails-if(OSX||winWidget) css-multicol/multicol-span-all-child-002.xht
+fails css-multicol/multicol-span-all-margin-001.xht
+fails css-multicol/multicol-span-all-margin-002.xht
+fails css-multicol/multicol-span-all-margin-bottom-001.xht
+fails css-multicol/multicol-span-all-margin-nested-001.xht
+fails css-multicol/multicol-span-all-margin-nested-002.xht
+fails css-multicol/multicol-span-all-margin-nested-003.xht
+fails css-multicol/multicol-span-all-margin-nested-firstchild-001.xht
+fails css-multicol/multicol-span-float-001.xht
+fails css-multicol/multicol-span-none-001.xht
+fails css-multicol/multicol-table-cell-001.xht
+fails css-multicol/multicol-table-cell-height-001.xht
+fails css-multicol/multicol-table-cell-height-002.xht
+fails css-multicol/multicol-table-cell-vertical-align-001.xht
+fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol/multicol-width-002.xht
+fails css-multicol/multicol-width-count-002.xht
+fails css-multicol/multicol-width-ems-001.xht
+fails css-multicol/multicol-width-negative-001.xht
+fuzzy(225,1060) css-multicol/multicol-width-large-001.xht
+fails css-multicol/multicol-width-small-001.xht
+fuzzy(225,1060) css-multicol/multicol-width-invalid-001.xht
+fuzzy(225,1060) css-multicol/multicol-width-large-002.xht
+fails css-multicol/multicol-zero-height-001.xht
+fuzzy(225,13600) css-multicol/multicol-nested-column-rule-001.xht
+fuzzy(94,256) css-multicol/multicol-rule-none-000.xht
 
 #This test seems to pass only on Linux-opt build, on everything else
 #Therefore using fuzzy annotation as a catch all
-fuzzy(255,2808) css-multicol-1/multicol-rule-large-001.xht
+fuzzy(255,2808) css-multicol/multicol-rule-large-001.xht
 
 # fails because column-span property not implemented (Bug 616436)
-fails css-multicol-1/multicol-fill-auto-block-children-001.xht
-fails css-multicol-1/multicol-fill-auto-block-children-002.xht
-fails css-multicol-1/multicol-span-all-block-sibling-003.xht
+fails css-multicol/multicol-fill-auto-block-children-001.xht
+fails css-multicol/multicol-fill-auto-block-children-002.xht
+fails css-multicol/multicol-span-all-block-sibling-003.xht
--- a/layout/reftests/w3c-css/import-tests.py
+++ b/layout/reftests/w3c-css/import-tests.py
@@ -25,22 +25,22 @@ import re
 # least for a subset of secs.  And we probably want to organize the
 # directory structure by spec to avoid constant file moves when files
 # move in the W3C repository.  And we probably also want to import each
 # test only once, even if it covers more than one spec.)
 
 # But for now, let's just import a few sets of tests.
 
 gSubtrees = [
-    os.path.join("css-namespaces-3"),
-    os.path.join("css-conditional-3"),
-    os.path.join("css-values-3"),
-    os.path.join("css-multicol-1"),
-    os.path.join("css-writing-modes-3"),
-    os.path.join("selectors4"),
+    os.path.join("css-namespaces"),
+    os.path.join("css-conditional"),
+    os.path.join("css-values"),
+    os.path.join("css-multicol"),
+    os.path.join("css-writing-modes"),
+    os.path.join("selectors"),
 ]
 
 gPrefixedProperties = [
     "column-count",
     "column-fill",
     "column-gap",
     "column-rule",
     "column-rule-color",