merge mozilla-aurora to b2g44 a=merge

--HG-- extra : rebase_source : 982df304d8a0ac768bd59e8c78daf0926c7ad1a4
mozilla-b2g · Dec 14, 2015 · 284f5c7 · 284f5c7
2 parents 5e592b7 + ddaf7b4
commit 284f5c7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/layout/reftests/writing-mode/reftest.list b/layout/reftests/writing-mode/reftest.list
@@ -167,7 +167,8 @@ fuzzy-if(gtkWidget||B2G,255,6) fuzzy-if(cocoaWidget,65,69) == 1193519-sideways-l
 != 1216747-1.html 1216747-1-notref.html
 
 # Suite of tests from Gérard Talbot in bug 1079151
-include abspos/reftest.list
+# Frequent Windows 7 load failed: timed out waiting for test to complete (waiting for onload scripts to complete), bug 1167155 and friends
+skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) include abspos/reftest.list
 
 # Tests for tables with vertical writing modes
 include tables/reftest.list