merge mozilla-aurora to b2g44 a=merge B2G_2_5_20151214_MERGEDAY
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 14 Dec 2015 08:24:17 +0100
changeset 285029 d76a9f65b6ba2ab587d3a0fb5119773ba68720a0
parent 285027 ded0306e0d78528cdcb237c8b05543390f10ec96 (current diff)
parent 285028 0f9c2337da96fde3cc8f2c63200b56ee2578b6fd (diff)
child 285030 78330b5cadd4c2f762109ce1915a8d12ab033986
push id213
push usercbook@mozilla.com
push dateMon, 14 Dec 2015 07:25:15 +0000
reviewersmerge
milestone44.0a2
merge mozilla-aurora to b2g44 a=merge
--- a/layout/reftests/writing-mode/reftest.list
+++ b/layout/reftests/writing-mode/reftest.list
@@ -162,12 +162,13 @@ fuzzy-if(gtkWidget||B2G,255,6) fuzzy-if(
 
 == 1196887-1-computed-display-inline-block.html 1196887-1-computed-display-inline-block-ref.html
 == 1205787-legacy-svg-values-1.html 1205787-legacy-svg-values-1-ref.html
 
 == 1216747-1.html 1216747-1-ref.html
 != 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