Bug 1258916 part 7 - Use the directory structure from upstream repo for test and reference files. r?dbaron draft
authorXidorn Quan <quanxunzhen@gmail.com>
Fri, 15 Apr 2016 15:24:10 +1000
changeset 352006 83bd922895d4f69a68795a218ead3c0d7ac649fa
parent 352005 b1cb735efe2c495aba263886bf976faf27fead78
child 352007 3241bbfbffcdddece9b7eedf150552e761a7ae9e
push id15585
push userxquan@mozilla.com
push dateFri, 15 Apr 2016 13:43:42 +0000
reviewersdbaron
bugs1258916
milestone48.0a1
Bug 1258916 part 7 - Use the directory structure from upstream repo for test and reference files. r?dbaron MozReview-Commit-ID: E9HCyCGMtqp
layout/reftests/w3c-css/import-tests.py
layout/reftests/w3c-css/received/css-conditional-3/background-lime.html
layout/reftests/w3c-css/received/css-conditional-3/reference/background-lime.html
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1-block.xml
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1-generic.xml
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1.xml
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-2-generic.xml
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-2.xml
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-3.xml
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-5.xml
layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-6.xml
layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-1-block.xml
layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-1-generic.xml
layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-1.xml
layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-2-generic.xml
layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-2.xml
layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-3.xml
layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-5.xml
layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-6.xml
layout/reftests/w3c-css/received/css-values-3/200-200-green.html
layout/reftests/w3c-css/received/css-values-3/all-green.html
layout/reftests/w3c-css/received/css-values-3/ch-unit-001-ref.html
layout/reftests/w3c-css/received/css-values-3/reference/200-200-green.html
layout/reftests/w3c-css/received/css-values-3/reference/all-green.html
layout/reftests/w3c-css/received/css-values-3/reference/ch-unit-001-ref.html
layout/reftests/w3c-css/received/css-values-3/reference/vh_not_refreshing_on_chrome-ref.html
layout/reftests/w3c-css/received/css-values-3/vh_not_refreshing_on_chrome-ref.html
layout/reftests/w3c-css/received/import.log
layout/reftests/w3c-css/received/reftest.list
--- a/layout/reftests/w3c-css/import-tests.py
+++ b/layout/reftests/w3c-css/import-tests.py
@@ -2,17 +2,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 import os
 from optparse import OptionParser
 from subprocess import Popen, PIPE
 import xml.dom.minidom
 import html5lib
-import filecmp
 import fnmatch
 import shutil
 import sys
 import re
 
 # FIXME:
 #   * Import more tests rather than just the very limited set currently
 #     chosen.
@@ -127,50 +126,51 @@ def copy_file(test, srcfile, destname, i
     logname = srcfile[len(gSrcPath):]
     gLog.write("Importing " + to_unix_path_sep(logname) +
                " to " + to_unix_path_sep(destname) + "\n")
     destfile = os.path.join(gDestPath, destname)
     destdir = os.path.dirname(destfile)
     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)
     support_dir = os.path.join(dirname, "support")
     if not os.path.exists(support_dir):
         return
     for dirpath, dirnames, filenames in os.walk(support_dir):
         for fn in filenames:
             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
     document = get_document_for(fn)
-    destname = os.path.join(spec, os.path.basename(fn))
     gTestFlags[destname] = []
 
     for meta in document.getElementsByTagName("meta"):
         name = meta.getAttribute("name")
         if name == "flags":
             gTestFlags[destname] = meta.getAttribute("content").split()
 
 def is_html(fn):
@@ -184,52 +184,47 @@ def get_document_for(fn):
         parser = html5lib.HTMLParser(tree=html5lib.treebuilders.getTreeBuilder("dom"))
         document = parser.parse(f)
         f.close()
     else:
         # An XML file
         document = xml.dom.minidom.parse(fn)
     return document
 
-def add_test_items(fn, spec):
+def add_test_items(fn):
     document = get_document_for(fn)
     refs = []
     notrefs = []
     for link in document.getElementsByTagName("link"):
         rel = link.getAttribute("rel")
         if rel == "match":
             arr = refs
         elif rel == "mismatch":
             arr = notrefs
         else:
             continue
         arr.append(os.path.join(os.path.dirname(fn), str(link.getAttribute("href"))))
     if len(refs) > 1:
         raise StandardError("Need to add code to specify which reference we want to match.")
-    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")
     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>
 """
 AHEM_DECL_XML = """<style type="text/css"><![CDATA[
 """ + AHEM_DECL_CONTENT + """
 ]]></style>
 """
@@ -242,17 +237,19 @@ def copy_and_prefix(test, aSourceFileNam
     ahemFontAdded = False
     for line in unPrefixedFile:
         replacementLine = line
         searchRegex = "\s*<style\s*"
 
         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
+            path = os.path.relpath(AHEM_FONT_PATH, os.path.dirname(aDestFileName))
+            newFile.write(template.format(to_unix_path_sep(path)))
             ahemFontAdded = True
 
         for rule in aProps:
             replacementLine = replacementLine.replace(rule, "-moz-" + rule)
         newFile.write(replacementLine)
 
     newFile.close()
     unPrefixedFile.close()
@@ -309,17 +306,17 @@ def main():
     setup_paths()
     read_fail_list()
     setup_log()
     write_log_header()
     remove_existing_dirs()
     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__)))
     lastDefaultPreferences = None
     for test in tests:
         defaultPreferences = gDefaultPreferences.get(test[1].split("/")[0], None)
         if defaultPreferences != lastDefaultPreferences:
             if defaultPreferences is None:
rename from layout/reftests/w3c-css/received/css-conditional-3/background-lime.html
rename to layout/reftests/w3c-css/received/css-conditional-3/reference/background-lime.html
rename from layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1-block.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-1-block.xml
rename from layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1-generic.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-1-generic.xml
rename from layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-1.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-1.xml
rename from layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-2-generic.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-2-generic.xml
rename from layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-2.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-2.xml
rename from layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-3.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-3.xml
rename from layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-5.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-5.xml
rename from layout/reftests/w3c-css/received/css-namespaces-3/ref-lime-6.xml
rename to layout/reftests/w3c-css/received/css-namespaces-3/reftest/ref-lime-6.xml
rename from layout/reftests/w3c-css/received/css-values-3/200-200-green.html
rename to layout/reftests/w3c-css/received/css-values-3/reference/200-200-green.html
rename from layout/reftests/w3c-css/received/css-values-3/all-green.html
rename to layout/reftests/w3c-css/received/css-values-3/reference/all-green.html
rename from layout/reftests/w3c-css/received/css-values-3/ch-unit-001-ref.html
rename to layout/reftests/w3c-css/received/css-values-3/reference/ch-unit-001-ref.html
rename from layout/reftests/w3c-css/received/css-values-3/vh_not_refreshing_on_chrome-ref.html
rename to layout/reftests/w3c-css/received/css-values-3/reference/vh_not_refreshing_on_chrome-ref.html
--- a/layout/reftests/w3c-css/received/import.log
+++ b/layout/reftests/w3c-css/received/import.log
@@ -1,12 +1,12 @@
-Importing revision: 9ec930459141785bdf59b0bf6ec0cc3e73435d00
+Importing revision: fd408231b428c73d742d122f789203d51facc88a
 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
 Importing css-conditional-3/at-supports-002.html to css-conditional-3/at-supports-002.html
 Importing css-conditional-3/at-supports-003.html to css-conditional-3/at-supports-003.html
 Importing css-conditional-3/at-supports-004.html to css-conditional-3/at-supports-004.html
 Importing css-conditional-3/at-supports-005.html to css-conditional-3/at-supports-005.html
 Importing css-conditional-3/at-supports-006.html to css-conditional-3/at-supports-006.html
@@ -44,42 +44,42 @@ Importing css-conditional-3/at-supports-
 Importing css-conditional-3/at-supports-037.html to css-conditional-3/at-supports-037.html
 Importing css-conditional-3/at-supports-038.html to css-conditional-3/at-supports-038.html
 Importing css-conditional-3/at-supports-039.html to css-conditional-3/at-supports-039.html
 Importing css-namespaces-3/prefix-001.xml to css-namespaces-3/prefix-001.xml
 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
 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
 Importing css-namespaces-3/syntax-015.xml to css-namespaces-3/syntax-015.xml
 Importing css-values-3/attr-color-invalid-cast.html to css-values-3/attr-color-invalid-cast.html
 Importing css-values-3/support/1x1-green.png to css-values-3/support/1x1-green.png
 Importing css-values-3/support/1x1-lime.png to css-values-3/support/1x1-lime.png
 Importing css-values-3/support/1x1-maroon.png to css-values-3/support/1x1-maroon.png
@@ -119,47 +119,47 @@ Importing css-values-3/support/test-bl.p
 Importing css-values-3/support/test-br.png to css-values-3/support/test-br.png
 Importing css-values-3/support/test-inner-half-size.png to css-values-3/support/test-inner-half-size.png
 Importing css-values-3/support/test-outer.png to css-values-3/support/test-outer.png
 Importing css-values-3/support/test-tl.png to css-values-3/support/test-tl.png
 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
 Importing css-values-3/attr-invalid-type-002.html to css-values-3/attr-invalid-type-002.html
 Importing css-values-3/attr-invalid-type-003.html to css-values-3/attr-invalid-type-003.html
 Importing css-values-3/attr-length-invalid-cast.html to css-values-3/attr-length-invalid-cast.html
 Importing css-values-3/attr-length-invalid-fallback.html to css-values-3/attr-length-invalid-fallback.html
 Importing css-values-3/attr-length-valid-zero-nofallback.html to css-values-3/attr-length-valid-zero-nofallback.html
 Importing css-values-3/attr-length-valid-zero.html to css-values-3/attr-length-valid-zero.html
 Importing css-values-3/attr-length-valid.html to css-values-3/attr-length-valid.html
 Importing css-values-3/attr-px-invalid-cast.html to css-values-3/attr-px-invalid-cast.html
 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
 Importing css-values-3/vh-em-inherit.html to css-values-3/vh-em-inherit.html
 Importing css-values-3/vh-inherit.html to css-values-3/vh-inherit.html
 Importing css-values-3/vh-interpolate-pct.html to css-values-3/vh-interpolate-pct.html
 Importing css-values-3/vh-interpolate-px.html to css-values-3/vh-interpolate-px.html
 Importing css-values-3/vh-interpolate-vh.html to css-values-3/vh-interpolate-vh.html
 Importing css-values-3/vh-support-atviewport.html to css-values-3/vh-support-atviewport.html
 Importing css-values-3/vh-support-margin.html to css-values-3/vh-support-margin.html
 Importing css-values-3/vh-support-transform-origin.html to css-values-3/vh-support-transform-origin.html
 Importing css-values-3/vh-support-transform-translate.html to css-values-3/vh-support-transform-translate.html
 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
--- a/layout/reftests/w3c-css/received/reftest.list
+++ b/layout/reftests/w3c-css/received/reftest.list
@@ -1,12 +1,12 @@
 # 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
 == css-conditional-3/at-supports-004.html css-conditional-3/at-supports-001-ref.html
 == css-conditional-3/at-supports-005.html css-conditional-3/at-supports-001-ref.html
 == css-conditional-3/at-supports-006.html css-conditional-3/at-supports-001-ref.html
 == css-conditional-3/at-supports-007.html css-conditional-3/at-supports-001-ref.html
 == css-conditional-3/at-supports-008.html css-conditional-3/at-supports-001-ref.html
@@ -36,67 +36,67 @@
 == css-conditional-3/at-supports-032.html css-conditional-3/at-supports-001-ref.html
 == css-conditional-3/at-supports-033.html css-conditional-3/at-supports-001-ref.html
 == css-conditional-3/at-supports-034.html css-conditional-3/at-supports-001-ref.html
 == css-conditional-3/at-supports-035.html css-conditional-3/at-supports-001-ref.html
 == css-conditional-3/at-supports-036.html css-conditional-3/at-supports-001-ref.html
 == 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
-== 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