Bug 1258916 part 7 - Use the directory structure from upstream repo for test and reference files. r=dbaron

MozReview-Commit-ID: E9HCyCGMtqp

--HG--
rename : layout/reftests/w3c-css/received/css-conditional-3/background-lime.html => layout/reftests/w3c-css/received/css-conditional-3/reference/background-lime.html
rename : layout/reftests/w3c-css/received/css-multicol-1/multicol-basic-ref.html => layout/reftests/w3c-css/received/css-multicol-1/reference/multicol-basic-ref.html
rename : layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1-block.xml => layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-1-block.xml
rename : layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1-generic.xml => layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-1-generic.xml
rename : layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1.xml => layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-1.xml
rename : layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-2-generic.xml => layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-2-generic.xml
rename : layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-2.xml => layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-2.xml
rename : layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-3.xml => layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-3.xml
rename : layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-5.xml => layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-5.xml
rename : layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-6.xml => layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-6.xml
rename : layout/reftests/w3c-css/received/css-values-3/200-200-green.html => layout/reftests/w3c-css/received/css-values-3/reference/200-200-green.html
rename : layout/reftests/w3c-css/received/css-values-3/all-green.html => layout/reftests/w3c-css/received/css-values-3/reference/all-green.html
rename : layout/reftests/w3c-css/received/css-values-3/ch-unit-001-ref.html => layout/reftests/w3c-css/received/css-values-3/reference/ch-unit-001-ref.html
rename : layout/reftests/w3c-css/received/css-values-3/vh_not_refreshing_on_chrome-ref.html => layout/reftests/w3c-css/received/css-values-3/reference/vh_not_refreshing_on_chrome-ref.html
rename : layout/reftests/w3c-css/received/css-multicol-1/ref-filled-green-100px-square.xht => layout/reftests/w3c-css/received/reference/ref-filled-green-100px-square.xht
extra : source : f2cca58157c5bbd7cfa54af98cfe8b32bc215f7b

layout/reftests/w3c-css/import-tests.py

@@ -7,7 +7,6 @@ from optparse import OptionParser
 from subprocess import Popen, PIPE
 import xml.dom.minidom
 import html5lib
-import filecmp
 import fnmatch
 import shutil
 import sys
@@ -134,13 +133,11 @@ def copy_file(test, srcfile, destname, isSupportFile=False):
     if not os.path.exists(destdir):
         os.makedirs(destdir)
     if os.path.exists(destfile):
-        if filecmp.cmp(srcfile, destfile):
-            print "Warning: duplicate file {}".format(destname)
-            return
         raise StandardError("file " + destfile + " already exists")
     copy_and_prefix(test, srcfile, destfile, gPrefixedProperties, isSupportFile)
 
-def copy_support_files(test, dirname, spec):
+def copy_support_files(test, dirname):
+    global gSrcPath
     if dirname in support_dirs_mapped:
         return
     support_dirs_mapped.add(dirname)
@@ -152,21 +149,24 @@ def copy_support_files(test, dirname, spec):
             if fn == "LOCK":
                 continue
             full_fn = os.path.join(dirpath, fn)
-            copy_file(test, full_fn, os.path.join(spec, "support", full_fn[len(support_dir)+1:]), True)
+            destname = to_unix_path_sep(os.path.relpath(full_fn, gSrcPath))
+            copy_file(test, full_fn, destname, True)
 
-def map_file(fn, spec):
+def map_file(fn):
+    global gSrcPath
+    fn = to_unix_path_sep(os.path.normpath(fn))
     if fn in filemap:
         return filemap[fn]
-    destname = os.path.join(spec, os.path.basename(fn))
+    destname = to_unix_path_sep(os.path.relpath(fn, gSrcPath))
+    destdir = os.path.dirname(destname)
     filemap[fn] = destname
-    load_flags_for(fn, spec)
+    load_flags_for(fn, destname)
     copy_file(destname, fn, destname, False)
-    copy_support_files(destname, os.path.dirname(fn), spec)
+    copy_support_files(destname, os.path.dirname(fn))
     return destname
 
-def load_flags_for(fn, spec):
+def load_flags_for(fn, destname):
     global gTestFlags
-    destname = os.path.join(spec, os.path.basename(fn))
     gTestFlags[destname] = []
 
     if not (is_html(fn) or is_xml(fn)):
@@ -196,16 +196,9 @@ def get_document_for(fn):
         document = xml.dom.minidom.parse(fn)
     return document
 
-def add_test_items(fn, spec):
-    if spec is None:
-        for subtree in gSubtrees:
-            if fn.startswith(subtree):
-                spec = os.path.basename(subtree)
-                break
-        else:
-            raise StandardError("Could not associate test " + fn + " with specification")
+def add_test_items(fn):
     if not (is_html(fn) or is_xml(fn)):
-        map_file(fn, spec)
+        map_file(fn)
         return None
     document = get_document_for(fn)
     refs = []
@@ -225,19 +218,21 @@ def add_test_items(fn, spec):
     if len(refs) > 1:
         raise StandardError("Need to add code to specify which reference we want to match.")
     for ref in refs:
-        tests.append(["==", map_file(fn, spec), map_file(ref, spec)])
+        tests.append(["==", map_file(fn), map_file(ref)])
     for notref in notrefs:
-        tests.append(["!=", map_file(fn, spec), map_file(notref, spec)])
+        tests.append(["!=", map_file(fn), map_file(notref)])
     # Add chained references too
     for ref in refs:
-        add_test_items(ref, spec=spec)
+        add_test_items(ref)
     for notref in notrefs:
-        add_test_items(notref, spec=spec)
+        add_test_items(notref)
 
-AHEM_DECL_CONTENT = """@font-face {
+AHEM_FONT_PATH = os.path.normpath(
+    os.path.join(os.path.dirname(__file__), "../fonts/Ahem.ttf"))
+AHEM_DECL_CONTENT = """@font-face {{
   font-family: Ahem;
-  src: url("../../../fonts/Ahem.ttf");
-}"""
+  src: url("{}");
+}}"""
 AHEM_DECL_HTML = """<style type="text/css">
 """ + AHEM_DECL_CONTENT + """
 </style>
@@ -260,7 +255,9 @@ def copy_and_prefix(test, aSourceFileName, aDestFileName, aProps, isSupportFile=
         if not isSupportFile and not ahemFontAdded and 'ahem' in gTestFlags[test] and re.search(searchRegex, line):
             # First put our ahem font declation before the first <style>
             # element
-            newFile.write(AHEM_DECL_HTML if is_html(aDestFileName) else AHEM_DECL_XML)
+            template = AHEM_DECL_HTML if is_html(aDestFileName) else AHEM_DECL_XML
+            ahemPath = os.path.relpath(AHEM_FONT_PATH, os.path.dirname(aDestFileName))
+            newFile.write(template.format(to_unix_path_sep(ahemPath)))
             ahemFontAdded = True
 
         for prop in aProps:
@@ -328,7 +325,7 @@ def main():
     populate_test_files()
 
     for t in gTestfiles:
-        add_test_items(t, spec=None)
+        add_test_items(t)
 
     listfile = open(os.path.join(gDestPath, "reftest.list"), "wb")
     listfile.write("# THIS FILE IS AUTOGENERATED BY {0}\n# DO NOT EDIT!\n".format(os.path.basename(__file__)))

layout/reftests/w3c-css/received/css-multicol-1/reference/multicol-basic-ref.html

@@ -10,7 +10,7 @@
 <style type="text/css">
 @font-face {
   font-family: Ahem;
-  src: url("../../../fonts/Ahem.ttf");
+  src: url("../../../../fonts/Ahem.ttf");
 }
 </style>
 	<style type="text/css">

layout/reftests/w3c-css/received/import.log

@@ -1,7 +1,7 @@
 Importing revision: d261d6def2373f64d94b113860b29d3e45a02bd1
-from repository: https://hg.csswg.org/test/
+from repository: https://hg.csswg.org/test
 Importing css-conditional-3/at-media-whitespace-optional-001.html to css-conditional-3/at-media-whitespace-optional-001.html
-Importing css-conditional-3/reference/background-lime.html to css-conditional-3/background-lime.html
+Importing css-conditional-3/reference/background-lime.html to css-conditional-3/reference/background-lime.html
 Importing css-conditional-3/at-media-whitespace-optional-002.html to css-conditional-3/at-media-whitespace-optional-002.html
 Importing css-conditional-3/at-supports-001.html to css-conditional-3/at-supports-001.html
 Importing css-conditional-3/at-supports-001-ref.html to css-conditional-3/at-supports-001-ref.html
@@ -85,7 +85,7 @@ Importing css-multicol-1/support/test-br.png to css-multicol-1/support/test-br.p
 Importing css-multicol-1/support/test-outer.png to css-multicol-1/support/test-outer.png
 Importing css-multicol-1/support/test-tl.png to css-multicol-1/support/test-tl.png
 Importing css-multicol-1/support/test-tr.png to css-multicol-1/support/test-tr.png
-Importing css-multicol-1/reference/multicol-basic-ref.html to css-multicol-1/multicol-basic-ref.html
+Importing css-multicol-1/reference/multicol-basic-ref.html to css-multicol-1/reference/multicol-basic-ref.html
 Importing css-multicol-1/multicol-basic-002.html to css-multicol-1/multicol-basic-002.html
 Importing css-multicol-1/multicol-basic-003.html to css-multicol-1/multicol-basic-003.html
 Importing css-multicol-1/multicol-basic-004.html to css-multicol-1/multicol-basic-004.html
@@ -189,7 +189,7 @@ Importing css-multicol-1/multicol-inherit-4-ref.xht to css-multicol-1/multicol-i
 Importing css-multicol-1/multicol-list-item-001.xht to css-multicol-1/multicol-list-item-001.xht
 Importing css-multicol-1/multicol-list-item-001-ref.xht to css-multicol-1/multicol-list-item-001-ref.xht
 Importing css-multicol-1/multicol-margin-001.xht to css-multicol-1/multicol-margin-001.xht
-Importing css-multicol-1/../reference/ref-filled-green-100px-square.xht to css-multicol-1/ref-filled-green-100px-square.xht
+Importing reference/ref-filled-green-100px-square.xht to reference/ref-filled-green-100px-square.xht
 Importing css-multicol-1/multicol-margin-002.xht to css-multicol-1/multicol-margin-002.xht
 Importing css-multicol-1/multicol-margin-child-001.xht to css-multicol-1/multicol-margin-child-001.xht
 Importing css-multicol-1/multicol-margin-child-001-ref.xht to css-multicol-1/multicol-margin-child-001-ref.xht
@@ -258,7 +258,7 @@ Importing css-multicol-1/multicol-rule-ridge-000.xht to css-multicol-1/multicol-
 Importing css-multicol-1/multicol-rule-samelength-001.xht to css-multicol-1/multicol-rule-samelength-001.xht
 Importing css-multicol-1/multicol-rule-samelength-001-ref.xht to css-multicol-1/multicol-rule-samelength-001-ref.xht
 Importing css-multicol-1/multicol-rule-shorthand-001.xht to css-multicol-1/multicol-rule-shorthand-001.xht
-Warning: href attribute found empty in /Users/npancholi/builds/CSSWGTests/test/css-multicol-1/multicol-rule-shorthand-2.xht
+Warning: href attribute found empty in ../../../../csswg-test/css-multicol-1\multicol-rule-shorthand-2.xht
 Importing css-multicol-1/multicol-rule-solid-000.xht to css-multicol-1/multicol-rule-solid-000.xht
 Importing css-multicol-1/multicol-rule-solid-000-ref.xht to css-multicol-1/multicol-rule-solid-000-ref.xht
 Importing css-multicol-1/multicol-rule-stacking-001.xht to css-multicol-1/multicol-rule-stacking-001.xht
@@ -330,22 +330,22 @@ Importing css-namespaces-3/support/fail.css to css-namespaces-3/support/fail.css
 Importing css-namespaces-3/support/scope-002a.css to css-namespaces-3/support/scope-002a.css
 Importing css-namespaces-3/support/scope-002b.css to css-namespaces-3/support/scope-002b.css
 Importing css-namespaces-3/support/syntax-007.css to css-namespaces-3/support/syntax-007.css
-Importing css-namespaces-3/reftest/ref-lime-1.xml to css-namespaces-3/ref-lime-1.xml
+Importing css-namespaces-3/reftest/ref-lime-1.xml to css-namespaces-3/reftest/ref-lime-1.xml
 Importing css-namespaces-3/prefix-002.xml to css-namespaces-3/prefix-002.xml
 Importing css-namespaces-3/prefix-003.xml to css-namespaces-3/prefix-003.xml
-Importing css-namespaces-3/reftest/ref-lime-1-generic.xml to css-namespaces-3/ref-lime-1-generic.xml
+Importing css-namespaces-3/reftest/ref-lime-1-generic.xml to css-namespaces-3/reftest/ref-lime-1-generic.xml
 Importing css-namespaces-3/prefix-004.xml to css-namespaces-3/prefix-004.xml
-Importing css-namespaces-3/reftest/ref-lime-2-generic.xml to css-namespaces-3/ref-lime-2-generic.xml
+Importing css-namespaces-3/reftest/ref-lime-2-generic.xml to css-namespaces-3/reftest/ref-lime-2-generic.xml
 Importing css-namespaces-3/prefix-005.xml to css-namespaces-3/prefix-005.xml
 Importing css-namespaces-3/prefix-006.xml to css-namespaces-3/prefix-006.xml
-Importing css-namespaces-3/reftest/ref-lime-2.xml to css-namespaces-3/ref-lime-2.xml
+Importing css-namespaces-3/reftest/ref-lime-2.xml to css-namespaces-3/reftest/ref-lime-2.xml
 Importing css-namespaces-3/scope-001.xml to css-namespaces-3/scope-001.xml
 Importing css-namespaces-3/scope-002.xml to css-namespaces-3/scope-002.xml
 Importing css-namespaces-3/syntax-001.xml to css-namespaces-3/syntax-001.xml
-Importing css-namespaces-3/reftest/ref-lime-1-block.xml to css-namespaces-3/ref-lime-1-block.xml
+Importing css-namespaces-3/reftest/ref-lime-1-block.xml to css-namespaces-3/reftest/ref-lime-1-block.xml
 Importing css-namespaces-3/syntax-002.xml to css-namespaces-3/syntax-002.xml
 Importing css-namespaces-3/syntax-003.xml to css-namespaces-3/syntax-003.xml
-Importing css-namespaces-3/reftest/ref-lime-5.xml to css-namespaces-3/ref-lime-5.xml
+Importing css-namespaces-3/reftest/ref-lime-5.xml to css-namespaces-3/reftest/ref-lime-5.xml
 Importing css-namespaces-3/syntax-004.xml to css-namespaces-3/syntax-004.xml
 Importing css-namespaces-3/syntax-005.xml to css-namespaces-3/syntax-005.xml
 Importing css-namespaces-3/syntax-006.xml to css-namespaces-3/syntax-006.xml
@@ -353,9 +353,9 @@ Importing css-namespaces-3/syntax-007.xml to css-namespaces-3/syntax-007.xml
 Importing css-namespaces-3/syntax-008.xml to css-namespaces-3/syntax-008.xml
 Importing css-namespaces-3/syntax-009.xml to css-namespaces-3/syntax-009.xml
 Importing css-namespaces-3/syntax-010.xml to css-namespaces-3/syntax-010.xml
-Importing css-namespaces-3/reftest/ref-lime-3.xml to css-namespaces-3/ref-lime-3.xml
+Importing css-namespaces-3/reftest/ref-lime-3.xml to css-namespaces-3/reftest/ref-lime-3.xml
 Importing css-namespaces-3/syntax-011.xml to css-namespaces-3/syntax-011.xml
-Importing css-namespaces-3/reftest/ref-lime-6.xml to css-namespaces-3/ref-lime-6.xml
+Importing css-namespaces-3/reftest/ref-lime-6.xml to css-namespaces-3/reftest/ref-lime-6.xml
 Importing css-namespaces-3/syntax-012.xml to css-namespaces-3/syntax-012.xml
 Importing css-namespaces-3/syntax-013.xml to css-namespaces-3/syntax-013.xml
 Importing css-namespaces-3/syntax-014.xml to css-namespaces-3/syntax-014.xml
@@ -405,7 +405,7 @@ Importing css-values-3/support/test-tr.png to css-values-3/support/test-tr.png
 Importing css-values-3/support/support/README to css-values-3/support/support/README
 Importing css-values-3/support/support/swatch-green.png to css-values-3/support/support/swatch-green.png
 Importing css-values-3/support/support/swatch-red.png to css-values-3/support/support/swatch-red.png
-Importing css-values-3/reference/200-200-green.html to css-values-3/200-200-green.html
+Importing css-values-3/reference/200-200-green.html to css-values-3/reference/200-200-green.html
 Importing css-values-3/attr-color-invalid-fallback.html to css-values-3/attr-color-invalid-fallback.html
 Importing css-values-3/attr-color-valid.html to css-values-3/attr-color-valid.html
 Importing css-values-3/attr-invalid-type-001.html to css-values-3/attr-invalid-type-001.html
@@ -420,13 +420,13 @@ Importing css-values-3/attr-px-invalid-cast.html to css-values-3/attr-px-invalid
 Importing css-values-3/attr-px-invalid-fallback.html to css-values-3/attr-px-invalid-fallback.html
 Importing css-values-3/attr-px-valid.html to css-values-3/attr-px-valid.html
 Importing css-values-3/calc-in-calc.html to css-values-3/calc-in-calc.html
-Importing css-values-3/reference/all-green.html to css-values-3/all-green.html
+Importing css-values-3/reference/all-green.html to css-values-3/reference/all-green.html
 Importing css-values-3/calc-in-media-queries-001.html to css-values-3/calc-in-media-queries-001.html
 Importing css-values-3/calc-in-media-queries-002.html to css-values-3/calc-in-media-queries-002.html
 Importing css-values-3/calc-invalid-range-clamping.html to css-values-3/calc-invalid-range-clamping.html
 Importing css-values-3/calc-parenthesis-stack.html to css-values-3/calc-parenthesis-stack.html
 Importing css-values-3/ch-unit-001.html to css-values-3/ch-unit-001.html
-Importing css-values-3/reference/ch-unit-001-ref.html to css-values-3/ch-unit-001-ref.html
+Importing css-values-3/reference/ch-unit-001-ref.html to css-values-3/reference/ch-unit-001-ref.html
 Importing css-values-3/initial-background-color.html to css-values-3/initial-background-color.html
 Importing css-values-3/vh-calc-support-pct.html to css-values-3/vh-calc-support-pct.html
 Importing css-values-3/vh-calc-support.html to css-values-3/vh-calc-support.html
@@ -442,7 +442,7 @@ Importing css-values-3/vh-support-transform-translate.html to css-values-3/vh-su
 Importing css-values-3/vh-support.html to css-values-3/vh-support.html
 Importing css-values-3/vh-zero-support.html to css-values-3/vh-zero-support.html
 Importing css-values-3/vh_not_refreshing_on_chrome.html to css-values-3/vh_not_refreshing_on_chrome.html
-Importing css-values-3/reference/vh_not_refreshing_on_chrome-ref.html to css-values-3/vh_not_refreshing_on_chrome-ref.html
+Importing css-values-3/reference/vh_not_refreshing_on_chrome-ref.html to css-values-3/reference/vh_not_refreshing_on_chrome-ref.html
 Importing css-values-3/vh_not_refreshing_on_chrome_iframe.html to css-values-3/vh_not_refreshing_on_chrome_iframe.html
 Importing selectors-4/focus-within-001.html to selectors-4/focus-within-001.html
 Importing selectors-4/focus-within-001-ref.html to selectors-4/focus-within-001-ref.html

layout/reftests/w3c-css/received/reftest.list

@@ -1,7 +1,7 @@
 # THIS FILE IS AUTOGENERATED BY import-tests.py
 # DO NOT EDIT!
-== css-conditional-3/at-media-whitespace-optional-001.html css-conditional-3/background-lime.html
-== css-conditional-3/at-media-whitespace-optional-002.html css-conditional-3/background-lime.html
+== css-conditional-3/at-media-whitespace-optional-001.html css-conditional-3/reference/background-lime.html
+== css-conditional-3/at-media-whitespace-optional-002.html css-conditional-3/reference/background-lime.html
 == css-conditional-3/at-supports-001.html css-conditional-3/at-supports-001-ref.html
 == css-conditional-3/at-supports-002.html css-conditional-3/at-supports-001-ref.html
 == css-conditional-3/at-supports-003.html css-conditional-3/at-supports-001-ref.html
@@ -41,10 +41,10 @@
 == css-conditional-3/at-supports-037.html css-conditional-3/at-supports-001-ref.html
 == css-conditional-3/at-supports-038.html css-conditional-3/at-supports-001-ref.html
 == css-conditional-3/at-supports-039.html css-conditional-3/at-supports-001-ref.html
-HTTP(../../..) == css-multicol-1/multicol-basic-001.html css-multicol-1/multicol-basic-ref.html
-HTTP(../../..) == css-multicol-1/multicol-basic-002.html css-multicol-1/multicol-basic-ref.html
-HTTP(../../..) == css-multicol-1/multicol-basic-003.html css-multicol-1/multicol-basic-ref.html
-HTTP(../../..) == css-multicol-1/multicol-basic-004.html css-multicol-1/multicol-basic-ref.html
+HTTP(../../..) == css-multicol-1/multicol-basic-001.html css-multicol-1/reference/multicol-basic-ref.html
+HTTP(../../..) == css-multicol-1/multicol-basic-002.html css-multicol-1/reference/multicol-basic-ref.html
+HTTP(../../..) == css-multicol-1/multicol-basic-003.html css-multicol-1/reference/multicol-basic-ref.html
+HTTP(../../..) == css-multicol-1/multicol-basic-004.html css-multicol-1/reference/multicol-basic-ref.html
 fails HTTP(../../..) == css-multicol-1/multicol-block-clip-001.xht css-multicol-1/multicol-block-clip-001-ref.xht
 fails HTTP(../../..) == css-multicol-1/multicol-block-clip-002.xht css-multicol-1/multicol-block-clip-002-ref.xht
 fails == css-multicol-1/multicol-br-inside-avoidcolumn-001.xht css-multicol-1/multicol-br-inside-avoidcolumn-ref.xht
@@ -103,8 +103,8 @@ fuzzy(116,1893) HTTP(../../..) == css-multicol-1/multicol-inherit-002.xht css-mu
 fails HTTP(../../..) == css-multicol-1/multicol-inherit-003.xht css-multicol-1/multicol-inherit-3-ref.xht
 fails HTTP(../../..) == css-multicol-1/multicol-inherit-004.xht css-multicol-1/multicol-inherit-4-ref.xht
 fuzzy(96,264) HTTP(../../..) == css-multicol-1/multicol-list-item-001.xht css-multicol-1/multicol-list-item-001-ref.xht
-fuzzy(73,1200) HTTP(../../..) == css-multicol-1/multicol-margin-001.xht css-multicol-1/ref-filled-green-100px-square.xht
-fuzzy(73,1200) HTTP(../../..) == css-multicol-1/multicol-margin-002.xht css-multicol-1/ref-filled-green-100px-square.xht
+fuzzy(73,1200) HTTP(../../..) == css-multicol-1/multicol-margin-001.xht reference/ref-filled-green-100px-square.xht
+fuzzy(73,1200) HTTP(../../..) == css-multicol-1/multicol-margin-002.xht reference/ref-filled-green-100px-square.xht
 fuzzy(243,3322) fuzzy-if(skiaContent,244,3322) HTTP(../../..) == css-multicol-1/multicol-margin-child-001.xht css-multicol-1/multicol-margin-child-001-ref.xht
 fuzzy(255,4008) HTTP(../../..) == css-multicol-1/multicol-nested-002.xht css-multicol-1/multicol-nested-002-ref.xht
 fuzzy(255,4109) HTTP(../../..) == css-multicol-1/multicol-nested-005.xht css-multicol-1/multicol-nested-005-ref.xht
@@ -181,65 +181,65 @@ fuzzy(225,1060) HTTP(../../..) == css-multicol-1/multicol-width-large-002.xht cs
 fails HTTP(../../..) == css-multicol-1/multicol-width-negative-001.xht css-multicol-1/multicol-count-002-ref.xht
 fails HTTP(../../..) == css-multicol-1/multicol-width-small-001.xht css-multicol-1/multicol-width-small-001-ref.xht
 fails == css-multicol-1/multicol-zero-height-001.xht css-multicol-1/multicol-zero-height-001-ref.xht
-== css-namespaces-3/prefix-001.xml css-namespaces-3/ref-lime-1.xml
-== css-namespaces-3/prefix-002.xml css-namespaces-3/ref-lime-1.xml
-== css-namespaces-3/prefix-003.xml css-namespaces-3/ref-lime-1-generic.xml
-== css-namespaces-3/prefix-004.xml css-namespaces-3/ref-lime-2-generic.xml
-== css-namespaces-3/prefix-005.xml css-namespaces-3/ref-lime-2-generic.xml
-== css-namespaces-3/prefix-006.xml css-namespaces-3/ref-lime-2.xml
-== css-namespaces-3/scope-001.xml css-namespaces-3/ref-lime-1.xml
-== css-namespaces-3/scope-002.xml css-namespaces-3/ref-lime-1.xml
-== css-namespaces-3/syntax-001.xml css-namespaces-3/ref-lime-1-block.xml
-== css-namespaces-3/syntax-002.xml css-namespaces-3/ref-lime-1-block.xml
-== css-namespaces-3/syntax-003.xml css-namespaces-3/ref-lime-5.xml
-== css-namespaces-3/syntax-004.xml css-namespaces-3/ref-lime-1.xml
-== css-namespaces-3/syntax-005.xml css-namespaces-3/ref-lime-5.xml
-== css-namespaces-3/syntax-006.xml css-namespaces-3/ref-lime-1.xml
-== css-namespaces-3/syntax-007.xml css-namespaces-3/ref-lime-1.xml
-== css-namespaces-3/syntax-008.xml css-namespaces-3/ref-lime-2.xml
-== css-namespaces-3/syntax-009.xml css-namespaces-3/ref-lime-1.xml
-== css-namespaces-3/syntax-010.xml css-namespaces-3/ref-lime-3.xml
-== css-namespaces-3/syntax-011.xml css-namespaces-3/ref-lime-6.xml
-== css-namespaces-3/syntax-012.xml css-namespaces-3/ref-lime-3.xml
-== css-namespaces-3/syntax-013.xml css-namespaces-3/ref-lime-5.xml
-== css-namespaces-3/syntax-014.xml css-namespaces-3/ref-lime-3.xml
-== css-namespaces-3/syntax-015.xml css-namespaces-3/ref-lime-1.xml
-fails == css-values-3/attr-color-invalid-cast.html css-values-3/200-200-green.html
-== css-values-3/attr-color-invalid-fallback.html css-values-3/200-200-green.html
-fails == css-values-3/attr-color-valid.html css-values-3/200-200-green.html
-== css-values-3/attr-invalid-type-001.html css-values-3/200-200-green.html
-== css-values-3/attr-invalid-type-002.html css-values-3/200-200-green.html
-== css-values-3/attr-invalid-type-003.html css-values-3/200-200-green.html
-fails == css-values-3/attr-length-invalid-cast.html css-values-3/200-200-green.html
-== css-values-3/attr-length-invalid-fallback.html css-values-3/200-200-green.html
-fails == css-values-3/attr-length-valid-zero-nofallback.html css-values-3/200-200-green.html
-fails == css-values-3/attr-length-valid-zero.html css-values-3/200-200-green.html
-fails == css-values-3/attr-length-valid.html css-values-3/200-200-green.html
-fails == css-values-3/attr-px-invalid-cast.html css-values-3/200-200-green.html
-== css-values-3/attr-px-invalid-fallback.html css-values-3/200-200-green.html
-fails == css-values-3/attr-px-valid.html css-values-3/200-200-green.html
-== css-values-3/calc-in-calc.html css-values-3/all-green.html
-fails == css-values-3/calc-in-media-queries-001.html css-values-3/all-green.html
-fails == css-values-3/calc-in-media-queries-002.html css-values-3/all-green.html
-== css-values-3/calc-invalid-range-clamping.html css-values-3/200-200-green.html
-== css-values-3/calc-parenthesis-stack.html css-values-3/all-green.html
-fuzzy-if(OSX,40,6) == css-values-3/ch-unit-001.html css-values-3/ch-unit-001-ref.html
-== css-values-3/initial-background-color.html css-values-3/all-green.html
-== css-values-3/vh-calc-support-pct.html css-values-3/all-green.html
-== css-values-3/vh-calc-support.html css-values-3/all-green.html
-== css-values-3/vh-em-inherit.html css-values-3/all-green.html
-== css-values-3/vh-inherit.html css-values-3/all-green.html
-== css-values-3/vh-interpolate-pct.html css-values-3/all-green.html
-== css-values-3/vh-interpolate-px.html css-values-3/all-green.html
-== css-values-3/vh-interpolate-vh.html css-values-3/all-green.html
-== css-values-3/vh-support-atviewport.html css-values-3/all-green.html
-== css-values-3/vh-support-margin.html css-values-3/all-green.html
-skip == css-values-3/vh-support-transform-origin.html css-values-3/all-green.html
-skip == css-values-3/vh-support-transform-translate.html css-values-3/all-green.html
-== css-values-3/vh-support.html css-values-3/all-green.html
-== css-values-3/vh-zero-support.html css-values-3/all-green.html
-skip == css-values-3/vh_not_refreshing_on_chrome.html css-values-3/vh_not_refreshing_on_chrome-ref.html
-skip == css-values-3/vh_not_refreshing_on_chrome_iframe.html css-values-3/vh_not_refreshing_on_chrome-ref.html
+== css-namespaces-3/prefix-001.xml css-namespaces-3/reftest/ref-lime-1.xml
+== css-namespaces-3/prefix-002.xml css-namespaces-3/reftest/ref-lime-1.xml
+== css-namespaces-3/prefix-003.xml css-namespaces-3/reftest/ref-lime-1-generic.xml
+== css-namespaces-3/prefix-004.xml css-namespaces-3/reftest/ref-lime-2-generic.xml
+== css-namespaces-3/prefix-005.xml css-namespaces-3/reftest/ref-lime-2-generic.xml
+== css-namespaces-3/prefix-006.xml css-namespaces-3/reftest/ref-lime-2.xml
+== css-namespaces-3/scope-001.xml css-namespaces-3/reftest/ref-lime-1.xml
+== css-namespaces-3/scope-002.xml css-namespaces-3/reftest/ref-lime-1.xml
+== css-namespaces-3/syntax-001.xml css-namespaces-3/reftest/ref-lime-1-block.xml
+== css-namespaces-3/syntax-002.xml css-namespaces-3/reftest/ref-lime-1-block.xml
+== css-namespaces-3/syntax-003.xml css-namespaces-3/reftest/ref-lime-5.xml
+== css-namespaces-3/syntax-004.xml css-namespaces-3/reftest/ref-lime-1.xml
+== css-namespaces-3/syntax-005.xml css-namespaces-3/reftest/ref-lime-5.xml
+== css-namespaces-3/syntax-006.xml css-namespaces-3/reftest/ref-lime-1.xml
+== css-namespaces-3/syntax-007.xml css-namespaces-3/reftest/ref-lime-1.xml
+== css-namespaces-3/syntax-008.xml css-namespaces-3/reftest/ref-lime-2.xml
+== css-namespaces-3/syntax-009.xml css-namespaces-3/reftest/ref-lime-1.xml
+== css-namespaces-3/syntax-010.xml css-namespaces-3/reftest/ref-lime-3.xml
+== css-namespaces-3/syntax-011.xml css-namespaces-3/reftest/ref-lime-6.xml
+== css-namespaces-3/syntax-012.xml css-namespaces-3/reftest/ref-lime-3.xml
+== css-namespaces-3/syntax-013.xml css-namespaces-3/reftest/ref-lime-5.xml
+== css-namespaces-3/syntax-014.xml css-namespaces-3/reftest/ref-lime-3.xml
+== css-namespaces-3/syntax-015.xml css-namespaces-3/reftest/ref-lime-1.xml
+fails == css-values-3/attr-color-invalid-cast.html css-values-3/reference/200-200-green.html
+== css-values-3/attr-color-invalid-fallback.html css-values-3/reference/200-200-green.html
+fails == css-values-3/attr-color-valid.html css-values-3/reference/200-200-green.html
+== css-values-3/attr-invalid-type-001.html css-values-3/reference/200-200-green.html
+== css-values-3/attr-invalid-type-002.html css-values-3/reference/200-200-green.html
+== css-values-3/attr-invalid-type-003.html css-values-3/reference/200-200-green.html
+fails == css-values-3/attr-length-invalid-cast.html css-values-3/reference/200-200-green.html
+== css-values-3/attr-length-invalid-fallback.html css-values-3/reference/200-200-green.html
+fails == css-values-3/attr-length-valid-zero-nofallback.html css-values-3/reference/200-200-green.html
+fails == css-values-3/attr-length-valid-zero.html css-values-3/reference/200-200-green.html
+fails == css-values-3/attr-length-valid.html css-values-3/reference/200-200-green.html
+fails == css-values-3/attr-px-invalid-cast.html css-values-3/reference/200-200-green.html
+== css-values-3/attr-px-invalid-fallback.html css-values-3/reference/200-200-green.html
+fails == css-values-3/attr-px-valid.html css-values-3/reference/200-200-green.html
+== css-values-3/calc-in-calc.html css-values-3/reference/all-green.html
+fails == css-values-3/calc-in-media-queries-001.html css-values-3/reference/all-green.html
+fails == css-values-3/calc-in-media-queries-002.html css-values-3/reference/all-green.html
+== css-values-3/calc-invalid-range-clamping.html css-values-3/reference/200-200-green.html
+== css-values-3/calc-parenthesis-stack.html css-values-3/reference/all-green.html
+fuzzy-if(OSX,40,6) == css-values-3/ch-unit-001.html css-values-3/reference/ch-unit-001-ref.html
+== css-values-3/initial-background-color.html css-values-3/reference/all-green.html
+== css-values-3/vh-calc-support-pct.html css-values-3/reference/all-green.html
+== css-values-3/vh-calc-support.html css-values-3/reference/all-green.html
+== css-values-3/vh-em-inherit.html css-values-3/reference/all-green.html
+== css-values-3/vh-inherit.html css-values-3/reference/all-green.html
+== css-values-3/vh-interpolate-pct.html css-values-3/reference/all-green.html
+== css-values-3/vh-interpolate-px.html css-values-3/reference/all-green.html
+== css-values-3/vh-interpolate-vh.html css-values-3/reference/all-green.html
+== css-values-3/vh-support-atviewport.html css-values-3/reference/all-green.html
+== css-values-3/vh-support-margin.html css-values-3/reference/all-green.html
+skip == css-values-3/vh-support-transform-origin.html css-values-3/reference/all-green.html
+skip == css-values-3/vh-support-transform-translate.html css-values-3/reference/all-green.html
+== css-values-3/vh-support.html css-values-3/reference/all-green.html
+== css-values-3/vh-zero-support.html css-values-3/reference/all-green.html
+skip == css-values-3/vh_not_refreshing_on_chrome.html css-values-3/reference/vh_not_refreshing_on_chrome-ref.html
+skip == css-values-3/vh_not_refreshing_on_chrome_iframe.html css-values-3/reference/vh_not_refreshing_on_chrome-ref.html
 needs-focus == selectors-4/focus-within-001.html selectors-4/focus-within-001-ref.html
 needs-focus == selectors-4/focus-within-002.html selectors-4/focus-within-001-ref.html
 needs-focus == selectors-4/focus-within-003.html selectors-4/focus-within-001-ref.html