Bug 1499124 - Increase font-loading timeouts for the font-display-1 reftest to allow for slow debug builds. r=emilio
authorJonathan Kew <jkew@mozilla.com>
Wed, 16 Jan 2019 21:58:52 +0000
changeset 511321 6f2303192174baaf9cab167db5f97411bad943bf
parent 511320 1d6b361c337ad7b5b4fa016030f2f2aa84a76f83
child 511322 4c08e7df7398a16e32d3e42943c960a5fc331a20
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemilio
bugs1499124
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1499124 - Increase font-loading timeouts for the font-display-1 reftest to allow for slow debug builds. r=emilio
layout/reftests/font-face/font-display-1.html
layout/reftests/font-face/reftest.list
--- a/layout/reftests/font-face/font-display-1.html
+++ b/layout/reftests/font-face/font-display-1.html
@@ -27,17 +27,17 @@ body { margin: 20px }
 @font-face {
   font-family: test1-fallback;
   src: url(../fonts/markA.woff);
   font-display: fallback;
 }
 
 @font-face {
   font-family: test1-optional;
-  src: url(../fonts/markfonts-delay.sjs?font=markA&delay=200&test=font-display-1-optional);
+  src: url(../fonts/markfonts-delay.sjs?font=markA&delay=2000&test=font-display-1-optional);
   font-display: optional;
 }
 
 div.test {
   font-size: 600%;
   line-height: 1.3em;
   width: 500px;
 }
--- a/layout/reftests/font-face/reftest.list
+++ b/layout/reftests/font-face/reftest.list
@@ -173,19 +173,18 @@ HTTP(..) == reflow-sanity-1-data.html re
 HTTP(..) == reflow-sanity-1.html reflow-sanity-1-data.html
 HTTP(..) == reflow-sanity-delay-1a.html reflow-sanity-1-ref.html
 HTTP(..) == reflow-sanity-delay-1b.html reflow-sanity-1-ref.html
 HTTP(..) == reflow-sanity-delay-1c.html reflow-sanity-1-ref.html
 HTTP(..) == reflow-sanity-delay-1-metrics.html reflow-sanity-1-ref.html
 
 HTTP(..) == bug-1481905-cancel-load.html bug-1481905-cancel-load-ref.html
 
-# font-display
-skip-if(/^Linux\x20i686/.test(http.oscpu)) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) HTTP(..) == font-display-1.html font-display-1-ref.html # normal font load (~500ms), bug 1392106
-# ^ disabled due to intermittents due to timing issues -- Bug 1238222
+# font-display, with the timeouts extended so that slow (debug) builds have a better chance to keep up
+pref(gfx.downloadable_fonts.fallback_delay,10000) pref(gfx.downloadable_fonts.fallback_delay_short,1000) HTTP(..) == font-display-1.html font-display-1-ref.html # normal font load (~500ms), bug 1392106
 fuzzy-if(OSX==1010,0-3,0-5) HTTP(..) == font-display-2.html font-display-2-ref.html # font load takes 4500ms
 
 # Testing hack for Meiryo
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == meiryo-en.html meiryo-ja.html # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == meiryo-en-bold.html meiryo-ja-bold.html # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == meiryo-en-italic.html meiryo-ja-italic.html # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == meiryo-en-oblique.html meiryo-ja-oblique.html # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == meiryo-en-bolditalic.html meiryo-ja-bolditalic.html # Bug 1392106