Bug 1392106 - skip css writing modes on win7/debug and fix import-tests.py to support reftest_writing_modes.list. r=gbrown,xidorn

layout/reftests/reftest_fonts.list

@@ -41,5 +41,5 @@ include text-svgglyphs/reftest.list
 include text-transform/reftest.list
 
 # css writing mode
-include w3c-css/received/reftest_writing_modes.list
+skip-if(winWidget&&isDebugBuild&&/^Windows\x20NT\x206\.1/.test(http.oscpu)) include w3c-css/received/reftest_writing_modes.list # Bug 1392106
 

layout/reftests/w3c-css/failures.list

@@ -59,10 +59,10 @@ 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||Android) 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||Android) 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||Android) css-writing-modes/sizing-orthog-htb-in-vrl-008.xht
-fails-if(OSX||winWidget) css-writing-modes/sizing-orthog-htb-in-vrl-020.xht
+fails-if(OSX||winWidget||Android) 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

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

@@ -71,7 +71,6 @@ support_dirs_mapped = set()
 filemap = {}
 speclinkmap = {}
 propsaddedfor = []
-tests = []
 gOptions = None
 gArgs = None
 gTestfiles = []
@@ -209,10 +208,11 @@ def get_document_for(srcname):
         document = xml.dom.minidom.parse(srcname)
     return document
 
-def add_test_items(srcname):
+def add_test_items(srcname, tests):
+
     if not (is_html(srcname) or is_xml(srcname)):
         map_file(srcname)
-        return None
+        return tests
     document = get_document_for(srcname)
     refs = []
     notrefs = []
@@ -236,9 +236,10 @@ def add_test_items(srcname):
         tests.append(["!=", map_file(srcname), map_file(notref)])
     # Add chained references too
     for ref in refs:
-        add_test_items(ref)
+        tests = add_test_items(ref, tests)
     for notref in notrefs:
-        add_test_items(notref)
+        tests = add_test_items(notref, tests)
+    return tests
 
 AHEM_FONT_PATH = os.path.normpath(
     os.path.join(os.path.dirname(__file__), "../fonts/Ahem.ttf"))
@@ -332,20 +333,9 @@ def read_fail_list():
             pat = re.compile(fnmatch.translate(items.pop()))
             gFailList.append((pat, refpat, items))
 
-def main():
+def create_list_file(filename, tests):
-    global gDestPath, gLog, gTestfiles, gTestFlags, gFailList
+    global gDestPath, gTestfiles, gTestFlags, gFailList
-    read_options()
+    listfile = open(os.path.join(gDestPath, filename), "wb")
-    setup_paths()
-    read_fail_list()
-    setup_log()
-    write_log_header()
-    remove_existing_dirs()
-    populate_test_files()
-
-    for t in gTestfiles:
-        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:
@@ -377,6 +367,30 @@ def main():
         listfile.write(" ".join(test) + "\n")
     listfile.close()
 
+def main():
+    global gLog
+    read_options()
+    setup_paths()
+    read_fail_list()
+    setup_log()
+    write_log_header()
+    remove_existing_dirs()
+    populate_test_files()
+
+    tests = []
+    for t in gTestfiles:
+        if 'css-writing-modes' in t:
+            continue
+        tests = add_test_items(t, tests)
+    create_list_file("reftest.list", tests)
+
+    tests = []
+    for t in gTestfiles:
+        if 'css-writing-modes' not in t:
+            continue
+        tests = add_test_items(t, tests)
+    create_list_file("reftest_writing_modes.list", tests)
+
     gLog.close()
 
 if __name__ == '__main__':

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

@@ -1,3 +1,5 @@
+# THIS FILE IS AUTOGENERATED BY import-tests.py
+# DO NOT EDIT!
 == css-writing-modes/abs-pos-non-replaced-icb-vlr-003.xht reference/ref-filled-green-100px-square.xht
 == css-writing-modes/abs-pos-non-replaced-icb-vlr-005.xht css-writing-modes/abs-pos-non-replaced-icb-vrl-004-ref.xht
 == css-writing-modes/abs-pos-non-replaced-icb-vlr-007.xht reference/ref-filled-green-100px-square.xht
@@ -919,4 +921,3 @@ fuzzy-if(OSX||winWidget,153,612) == css-writing-modes/writing-mode-vertical-lr-0
 fuzzy-if(OSX||winWidget,153,612) == css-writing-modes/writing-mode-vertical-rl-001.xht css-writing-modes/reftest/writing-mode-vertical-rl-001-ref.xht
 fuzzy-if(OSX||winWidget,153,612) == css-writing-modes/writing-mode-vertical-rl-002.xht css-writing-modes/reftest/writing-mode-vertical-rl-002-ref.xht
 fuzzy-if(OSX||winWidget,153,612) == css-writing-modes/writing-mode-vertical-rl-003.htm css-writing-modes/writing-mode-vertical-rl-003-ref.htm
-

taskcluster/ci/test/reftest.yml

@@ -230,7 +230,7 @@ reftest-no-accel:
     chunks:
         by-test-platform:
             macosx.*: 1
-            windows.*: 2
+            windows.*/opt: 2
             default: 4
     mozharness:
         chunked: