diff options
-rw-r--r-- | firefox-tests-reftest.patch | 120 | ||||
-rw-r--r-- | firefox.spec | 22 | ||||
-rw-r--r-- | mozilla-1700520.patch | 51 | ||||
-rwxr-xr-x | print-errors | 2 |
4 files changed, 128 insertions, 67 deletions
diff --git a/firefox-tests-reftest.patch b/firefox-tests-reftest.patch index d07d8fd..50dcc69 100644 --- a/firefox-tests-reftest.patch +++ b/firefox-tests-reftest.patch @@ -1,24 +1,24 @@ diff -U0 firefox-87.0/dom/canvas/test/reftest/filters/reftest.list.firefox-tests-reftest firefox-87.0/dom/canvas/test/reftest/filters/reftest.list --- firefox-87.0/dom/canvas/test/reftest/filters/reftest.list.firefox-tests-reftest 2021-03-18 14:48:29.000000000 +0100 -+++ firefox-87.0/dom/canvas/test/reftest/filters/reftest.list 2021-03-25 15:40:12.154581811 +0100 ++++ firefox-87.0/dom/canvas/test/reftest/filters/reftest.list 2021-03-25 18:32:51.615417692 +0100 @@ -21 +21 @@ -== units-ex.html ref.html +fuzzy-if(gtkWidget,0-255,0-100) == units-ex.html ref.html diff -U0 firefox-87.0/dom/html/reftests/autofocus/reftest.list.firefox-tests-reftest firefox-87.0/dom/html/reftests/autofocus/reftest.list --- firefox-87.0/dom/html/reftests/autofocus/reftest.list.firefox-tests-reftest 2021-03-18 14:48:34.000000000 +0100 -+++ firefox-87.0/dom/html/reftests/autofocus/reftest.list 2021-03-25 15:40:12.154581811 +0100 ++++ firefox-87.0/dom/html/reftests/autofocus/reftest.list 2021-03-25 18:32:51.615417692 +0100 @@ -7 +7 @@ -fuzzy-if(gtkWidget,0-18,0-1) needs-focus == textarea-load.html textarea-ref.html # One anti-aliased corner. +fuzzy-if(gtkWidget,0-56,0-2) needs-focus == textarea-load.html textarea-ref.html # One anti-aliased corner. diff -U0 firefox-87.0/dom/html/reftests/reftest.list.firefox-tests-reftest firefox-87.0/dom/html/reftests/reftest.list --- firefox-87.0/dom/html/reftests/reftest.list.firefox-tests-reftest 2021-03-18 14:48:34.000000000 +0100 -+++ firefox-87.0/dom/html/reftests/reftest.list 2021-03-25 15:40:12.154581811 +0100 ++++ firefox-87.0/dom/html/reftests/reftest.list 2021-03-25 18:32:51.615417692 +0100 @@ -46 +46 @@ -skip-if(isCoverageBuild) pref(layout.css.image-orientation.initial-from-image,true) fuzzy(0-2,0-830) == bug917595-iframe-1.html bug917595-1-ref.html +fuzzy-if(gtkWidget,0-2,0-847) skip-if(isCoverageBuild) pref(layout.css.image-orientation.initial-from-image,true) == bug917595-iframe-1.html bug917595-1-ref.html diff -U0 firefox-87.0/dom/media/test/reftest/reftest.list.firefox-tests-reftest firefox-87.0/dom/media/test/reftest/reftest.list --- firefox-87.0/dom/media/test/reftest/reftest.list.firefox-tests-reftest 2021-03-18 14:48:36.000000000 +0100 -+++ firefox-87.0/dom/media/test/reftest/reftest.list 2021-03-25 15:40:12.154581811 +0100 ++++ firefox-87.0/dom/media/test/reftest/reftest.list 2021-03-25 18:32:51.615417692 +0100 @@ -1,6 +0,0 @@ -skip-if(Android) fuzzy-if(OSX,0-80,0-76800) fuzzy-if(winWidget,0-62,0-76799) fuzzy-if(gtkWidget&&layersGPUAccelerated,0-70,0-644) HTTP(..) == short.mp4.firstframe.html short.mp4.firstframe-ref.html -skip-if(Android) fuzzy-if(OSX,0-87,0-76797) fuzzy-if(winWidget,0-60,0-76797) fuzzy-if(gtkWidget&&layersGPUAccelerated,0-60,0-1810) HTTP(..) == short.mp4.lastframe.html short.mp4.lastframe-ref.html @@ -28,13 +28,13 @@ diff -U0 firefox-87.0/dom/media/test/reftest/reftest.list.firefox-tests-reftest -skip-if(Android) skip-if(MinGW) skip-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI))) fuzzy(0-10,0-778536) == image-10bits-rendering-90-video.html image-10bits-rendering-90-ref.html diff -U0 firefox-87.0/dom/media/webvtt/test/reftest/reftest.list.firefox-tests-reftest firefox-87.0/dom/media/webvtt/test/reftest/reftest.list --- firefox-87.0/dom/media/webvtt/test/reftest/reftest.list.firefox-tests-reftest 2021-03-18 14:48:35.000000000 +0100 -+++ firefox-87.0/dom/media/webvtt/test/reftest/reftest.list 2021-03-25 16:58:19.311810281 +0100 ++++ firefox-87.0/dom/media/webvtt/test/reftest/reftest.list 2021-03-25 18:32:51.615417692 +0100 @@ -1,2 +0,0 @@ -skip-if(Android) fuzzy-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI)),0-136,0-427680) == vtt_update_display_after_removed_cue.html vtt_update_display_after_removed_cue_ref.html -skip-if(Android) fuzzy-if(winWidget,0-170,0-170) == vtt_overlapping_time.html vtt_overlapping_time-ref.html diff -U0 firefox-87.0/gfx/layers/apz/test/reftest/reftest.list.firefox-tests-reftest firefox-87.0/gfx/layers/apz/test/reftest/reftest.list --- firefox-87.0/gfx/layers/apz/test/reftest/reftest.list.firefox-tests-reftest 2021-03-18 14:48:37.000000000 +0100 -+++ firefox-87.0/gfx/layers/apz/test/reftest/reftest.list 2021-03-25 15:40:12.154581811 +0100 ++++ firefox-87.0/gfx/layers/apz/test/reftest/reftest.list 2021-03-25 18:32:51.615417692 +0100 @@ -6,6 +6,6 @@ -fuzzy-if(Android,0-1,0-2) fuzzy-if(webrender&>kWidget&&!swgl,7-8,24-32) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v.html async-scrollbar-1-v-ref.html -fuzzy-if(Android,0-4,0-5) fuzzy-if(webrender&>kWidget,28-30,28-32) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h.html async-scrollbar-1-h-ref.html @@ -53,20 +53,20 @@ diff -U0 firefox-87.0/gfx/layers/apz/test/reftest/reftest.list.firefox-tests-ref +# On desktop, even more fuzz is needed because thumb scaling is not exactly proportional: making the page twice as long diff -U0 firefox-87.0/image/test/reftest/downscaling/reftest.list.firefox-tests-reftest firefox-87.0/image/test/reftest/downscaling/reftest.list --- firefox-87.0/image/test/reftest/downscaling/reftest.list.firefox-tests-reftest 2021-03-18 14:48:42.000000000 +0100 -+++ firefox-87.0/image/test/reftest/downscaling/reftest.list 2021-03-25 15:40:12.154581811 +0100 ++++ firefox-87.0/image/test/reftest/downscaling/reftest.list 2021-03-25 18:32:51.615417692 +0100 @@ -92 +91,0 @@ -fuzzy(0-17,0-3221) fuzzy-if(gtkWidget&&!webrender,4-4,2616-2616) fuzzy-if(gtkWidget&&!webrender&&!layersGPUAccelerated,0-0,0-0) fuzzy-if(gtkWidget&&webrender,0-0,0-0) skip-if(Android) == downscale-moz-icon-1.html downscale-moz-icon-1-ref.html # gtkWidget Bug 1592059: regular is 2616, no-accel is 0, qr passes with 0 @@ -181 +179,0 @@ -fuzzy(0-53,0-6391) fuzzy-if(gtkWidget&&webrender,18-19,5502-5568) fails-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) skip-if(Android) == downscale-moz-icon-1.html downscale-moz-icon-1-ref.html # gtkWidget Bug 1592059 diff -U0 firefox-87.0/layout/reftests/abs-pos/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/abs-pos/reftest.list --- firefox-87.0/layout/reftests/abs-pos/reftest.list.firefox-tests-reftest 2021-03-18 14:48:54.000000000 +0100 -+++ firefox-87.0/layout/reftests/abs-pos/reftest.list 2021-03-25 15:40:12.154581811 +0100 ++++ firefox-87.0/layout/reftests/abs-pos/reftest.list 2021-03-25 18:32:51.616417722 +0100 @@ -54 +54 @@ -fuzzy-if(gtkWidget,0-1,0-1) fuzzy-if(Android,0-9,0-185) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-140,0-144) == scrollframe-2.html scrollframe-2-ref.html #bug 756530 +fuzzy-if(gtkWidget,0-100,0-160) fuzzy-if(Android,0-9,0-185) == scrollframe-2.html scrollframe-2-ref.html #bug 756530 diff -U0 firefox-87.0/layout/reftests/async-scrolling/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/async-scrolling/reftest.list --- firefox-87.0/layout/reftests/async-scrolling/reftest.list.firefox-tests-reftest 2021-03-18 14:48:53.000000000 +0100 -+++ firefox-87.0/layout/reftests/async-scrolling/reftest.list 2021-03-25 16:53:53.834817170 +0100 ++++ firefox-87.0/layout/reftests/async-scrolling/reftest.list 2021-03-25 18:32:51.616417722 +0100 @@ -27 +27 @@ -fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&>kWidget,32-33,28-32) fuzzy-if(webrender&&cocoaWidget,21-21,44-44) skip-if(!asyncPan) == position-fixed-transformed-1.html position-fixed-transformed-1-ref.html # Bug 1604338 +fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&>kWidget,30-50,30-50) fuzzy-if(webrender&&cocoaWidget,21-21,44-44) skip-if(!asyncPan) == position-fixed-transformed-1.html position-fixed-transformed-1-ref.html # Bug 1604338 @@ -115,7 +115,7 @@ diff -U0 firefox-87.0/layout/reftests/async-scrolling/reftest.list.firefox-tests +fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,13-13,4-4) fuzzy-if(webrender&>kWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,16-16,44-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-2.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338 diff -U0 firefox-87.0/layout/reftests/bidi/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/bidi/reftest.list --- firefox-87.0/layout/reftests/bidi/reftest.list.firefox-tests-reftest 2021-03-18 14:49:00.000000000 +0100 -+++ firefox-87.0/layout/reftests/bidi/reftest.list 2021-03-25 16:59:34.408070942 +0100 ++++ firefox-87.0/layout/reftests/bidi/reftest.list 2021-03-25 18:32:51.616417722 +0100 @@ -3 +3 @@ -fuzzy-if(cocoaWidget,0-1,0-1) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == bdi-element.html bdi-element-ref.html # Bug 1392106 +fuzzy(0-1, 0-1) fuzzy-if(cocoaWidget,0-1,0-1) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == bdi-element.html bdi-element-ref.html # Bug 1392106 @@ -143,13 +143,13 @@ diff -U0 firefox-87.0/layout/reftests/bidi/reftest.list.firefox-tests-reftest fi +fuzzy(0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-3a-rtl.html brackets-3a-rtl-ref.html # Bug 1392106 diff -U0 firefox-87.0/layout/reftests/border-radius/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/border-radius/reftest.list --- firefox-87.0/layout/reftests/border-radius/reftest.list.firefox-tests-reftest 2021-03-18 14:48:53.000000000 +0100 -+++ firefox-87.0/layout/reftests/border-radius/reftest.list 2021-03-25 15:40:12.154581811 +0100 ++++ firefox-87.0/layout/reftests/border-radius/reftest.list 2021-03-25 18:32:51.616417722 +0100 @@ -54 +54 @@ -fuzzy-if(Android,0-8,0-469) fuzzy-if(skiaContent,0-21,0-76) fuzzy-if(winWidget,0-144,0-335) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == clipping-6.html clipping-6-ref.html # PaintedLayer and MaskLayer with transforms that aren't identical, bug 1392106 +fuzzy-if(gtkWidget,0-80,0-300) fuzzy-if(Android,0-8,0-469) fuzzy-if(winWidget,0-144,0-335) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == clipping-6.html clipping-6-ref.html # PaintedLayer and MaskLayer with transforms that aren't identical, bug 1392106 diff -U0 firefox-87.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/bugs/reftest.list --- firefox-87.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest 2021-03-18 14:48:53.000000000 +0100 -+++ firefox-87.0/layout/reftests/bugs/reftest.list 2021-03-25 15:40:12.155581841 +0100 ++++ firefox-87.0/layout/reftests/bugs/reftest.list 2021-03-25 18:32:51.616417722 +0100 @@ -464 +463,0 @@ -== 341043-1a.html 341043-1-ref.html @@ -553 +552 @@ @@ -190,7 +190,7 @@ diff -U0 firefox-87.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest fi +fuzzy(0-30,0-2) fuzzy-if(winWidget&&webrender,0-31,0-3) fuzzy-if(geckoview&&webrender,0-93,0-87) == 1562733-rotated-nastaliq-2.html 1562733-rotated-nastaliq-2-ref.html diff -U0 firefox-87.0/layout/reftests/canvas/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/canvas/reftest.list --- firefox-87.0/layout/reftests/canvas/reftest.list.firefox-tests-reftest 2021-03-18 14:49:00.000000000 +0100 -+++ firefox-87.0/layout/reftests/canvas/reftest.list 2021-03-25 15:40:12.155581841 +0100 ++++ firefox-87.0/layout/reftests/canvas/reftest.list 2021-03-25 18:32:51.616417722 +0100 @@ -51,2 +50,0 @@ -!= text-font-lang.html text-font-lang-notref.html - @@ -199,7 +199,7 @@ diff -U0 firefox-87.0/layout/reftests/canvas/reftest.list.firefox-tests-reftest +fuzzy-if(gtkWidget,0-255,0-2304) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == text-small-caps-1.html text-small-caps-1-ref.html # Bug 1392106 diff -U0 firefox-87.0/layout/reftests/css-break/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/css-break/reftest.list --- firefox-87.0/layout/reftests/css-break/reftest.list.firefox-tests-reftest 2021-03-18 14:48:53.000000000 +0100 -+++ firefox-87.0/layout/reftests/css-break/reftest.list 2021-03-25 15:40:12.155581841 +0100 ++++ firefox-87.0/layout/reftests/css-break/reftest.list 2021-03-25 18:32:51.616417722 +0100 @@ -1,3 +1,3 @@ -== box-decoration-break-1.html box-decoration-break-1-ref.html -fuzzy(0-1,0-20) fuzzy-if(skiaContent,0-1,0-700) == box-decoration-break-with-inset-box-shadow-1.html box-decoration-break-with-inset-box-shadow-1-ref.html @@ -209,13 +209,13 @@ diff -U0 firefox-87.0/layout/reftests/css-break/reftest.list.firefox-tests-refte +skip-if(verify) fuzzy(0-73,0-264) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == box-decoration-break-with-outset-box-shadow-1.html box-decoration-break-with-outset-box-shadow-1-ref.html # Bug 1386543, bug 1392106 diff -U0 firefox-87.0/layout/reftests/css-placeholder/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/css-placeholder/reftest.list --- firefox-87.0/layout/reftests/css-placeholder/reftest.list.firefox-tests-reftest 2021-03-18 14:49:00.000000000 +0100 -+++ firefox-87.0/layout/reftests/css-placeholder/reftest.list 2021-03-25 15:40:12.155581841 +0100 ++++ firefox-87.0/layout/reftests/css-placeholder/reftest.list 2021-03-25 18:32:51.616417722 +0100 @@ -5 +5 @@ -fuzzy-if(gtkWidget&&nativeThemePref,255-255,1376-1881) == css-simple-styling.html css-simple-styling-ref.html # gtkWidget, Bug 1600749 +fuzzy-if(gtkWidget&&nativeThemePref,255-255,1300-1881) == css-simple-styling.html css-simple-styling-ref.html # gtkWidget, Bug 1600749 diff -U0 firefox-87.0/layout/reftests/css-ruby/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/css-ruby/reftest.list --- firefox-87.0/layout/reftests/css-ruby/reftest.list.firefox-tests-reftest 2021-03-18 14:49:00.000000000 +0100 -+++ firefox-87.0/layout/reftests/css-ruby/reftest.list 2021-03-25 15:40:12.155581841 +0100 ++++ firefox-87.0/layout/reftests/css-ruby/reftest.list 2021-03-25 18:32:51.616417722 +0100 @@ -17,4 +17,4 @@ -== relative-positioning-2.html relative-positioning-2-ref.html -== ruby-position-horizontal.html ruby-position-horizontal-ref.html @@ -233,31 +233,37 @@ diff -U0 firefox-87.0/layout/reftests/css-ruby/reftest.list.firefox-tests-reftes +fuzzy-if(gtkWidget,0-255,0-219) pref(layout.css.ruby.intercharacter.enabled,true) == ruby-intercharacter-2.htm ruby-intercharacter-2-ref.htm diff -U0 firefox-87.0/layout/reftests/first-letter/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/first-letter/reftest.list --- firefox-87.0/layout/reftests/first-letter/reftest.list.firefox-tests-reftest 2021-03-18 14:48:53.000000000 +0100 -+++ firefox-87.0/layout/reftests/first-letter/reftest.list 2021-03-25 15:40:12.155581841 +0100 ++++ firefox-87.0/layout/reftests/first-letter/reftest.list 2021-03-25 18:32:51.616417722 +0100 @@ -64 +64 @@ -fails-if(winWidget||cocoaWidget) fails-if(geckoview) == 617869-1.html 617869-1-ref.html # Bug 1558513 for GV +fuzzy-if(gtkWidget,0-260,0-900) fails-if(winWidget||cocoaWidget) fails-if(geckoview) == 617869-1.html 617869-1-ref.html # Bug 1558513 for GV diff -U0 firefox-87.0/layout/reftests/font-face/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/font-face/reftest.list --- firefox-87.0/layout/reftests/font-face/reftest.list.firefox-tests-reftest 2021-03-18 14:48:54.000000000 +0100 -+++ firefox-87.0/layout/reftests/font-face/reftest.list 2021-03-25 15:40:12.155581841 +0100 ++++ firefox-87.0/layout/reftests/font-face/reftest.list 2021-03-29 16:23:35.927490810 +0200 @@ -9 +9 @@ -== name-override-simple-1.html name-override-simple-1-ref.html +fuzzy-if(gtkWidget,0-112,0-107) == name-override-simple-1.html name-override-simple-1-ref.html -@@ -57 +57 @@ +@@ -26,3 +26,2 @@ +-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(Android) == src-list-local-full.html src-list-local-full-ref.html # Bug 1392106 +-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(Android) == src-list-local-full-quotes.html src-list-local-full-ref.html # Bug 1392106 +-== src-list-local-fallback.html src-list-local-fallback-ref.html ++fuzzy(0-255,0-6200) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(Android) == src-list-local-full.html src-list-local-full-ref.html # Bug 1392106 ++fuzzy(0-255,0-6200) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(Android) == src-list-local-full-quotes.html src-list-local-full-ref.html # Bug 1392106 +@@ -57 +56 @@ -== cross-iframe-1.html cross-iframe-1-ref.html +fuzzy-if(gtkWidget,0-112,0-107) == cross-iframe-1.html cross-iframe-1-ref.html -@@ -81 +81 @@ +@@ -81 +80 @@ -== sheet-set-switch-1.html sheet-set-switch-1-ref.html +fuzzy-if(gtkWidget,0-112,0-108) random-if(cocoaWidget) == sheet-set-switch-1.html sheet-set-switch-1-ref.html # bug 468217 -@@ -93 +93 @@ +@@ -93 +92 @@ -random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == local-1.html local-1-ref.html # Bug 1392106 -+fuzzy-if(gtkWidget,0-255,0-5663) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == local-1.html local-1-ref.html # Bug 1392106 -@@ -171,2 +171,2 @@ ++fuzzy-if(gtkWidget,0-255,0-7000) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == local-1.html local-1-ref.html # Bug 1392106 +@@ -171,2 +170,2 @@ -HTTP(..) == reflow-sanity-1.html reflow-sanity-1-ref.html -HTTP(..) == reflow-sanity-1-data.html reflow-sanity-1-ref.html +fuzzy-if(gtkWidget,0-104,0-406) HTTP(..) == reflow-sanity-1.html reflow-sanity-1-ref.html +fuzzy-if(gtkWidget,0-104,0-406) HTTP(..) == reflow-sanity-1-data.html reflow-sanity-1-ref.html -@@ -174,4 +174,4 @@ +@@ -174,4 +173,4 @@ -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 @@ -266,12 +272,12 @@ diff -U0 firefox-87.0/layout/reftests/font-face/reftest.list.firefox-tests-refte +fuzzy-if(gtkWidget,0-104,0-406) HTTP(..) == reflow-sanity-delay-1b.html reflow-sanity-1-ref.html +fuzzy-if(gtkWidget,0-104,0-406) HTTP(..) == reflow-sanity-delay-1c.html reflow-sanity-1-ref.html +fuzzy-if(gtkWidget,0-104,0-406) HTTP(..) == reflow-sanity-delay-1-metrics.html reflow-sanity-1-ref.html -@@ -204 +204 @@ +@@ -204 +203 @@ -# Currently Windows 7 and macOS all fail on +# Currently Windows 7 and macOS all fail on diff -U0 firefox-87.0/layout/reftests/font-matching/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/font-matching/reftest.list --- firefox-87.0/layout/reftests/font-matching/reftest.list.firefox-tests-reftest 2021-03-18 14:48:53.000000000 +0100 -+++ firefox-87.0/layout/reftests/font-matching/reftest.list 2021-03-25 15:40:12.155581841 +0100 ++++ firefox-87.0/layout/reftests/font-matching/reftest.list 2021-03-25 18:32:51.617417752 +0100 @@ -124 +124 @@ -random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == italic-oblique-2.html italic-oblique-ref.html # Bug 1392106 +fuzzy-if(gtkWidget,0-104,0-1836) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == italic-oblique-2.html italic-oblique-ref.html # Bug 1392106 @@ -285,51 +291,57 @@ diff -U0 firefox-87.0/layout/reftests/font-matching/reftest.list.firefox-tests-r +fuzzy-if(gtkWidget,0-104,0-1836) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == italic-oblique-9.html italic-oblique-ref.html # Bug 1392106 diff -U0 firefox-87.0/layout/reftests/forms/fieldset/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/forms/fieldset/reftest.list --- firefox-87.0/layout/reftests/forms/fieldset/reftest.list.firefox-tests-reftest 2021-03-18 14:48:53.000000000 +0100 -+++ firefox-87.0/layout/reftests/forms/fieldset/reftest.list 2021-03-25 15:40:12.155581841 +0100 ++++ firefox-87.0/layout/reftests/forms/fieldset/reftest.list 2021-03-25 18:32:51.617417752 +0100 @@ -8 +8 @@ -fuzzy-if(winWidget&&!layersGPUAccelerated,0-142,0-276) == positioned-container-1.html positioned-container-1-ref.html +fuzzy-if(gtkWidget,0-100,0-305) fuzzy-if(winWidget&&!layersGPUAccelerated,0-142,0-276) == positioned-container-1.html positioned-container-1-ref.html diff -U0 firefox-87.0/layout/reftests/forms/input/checkbox/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/forms/input/checkbox/reftest.list --- firefox-87.0/layout/reftests/forms/input/checkbox/reftest.list.firefox-tests-reftest 2021-03-18 14:48:54.000000000 +0100 -+++ firefox-87.0/layout/reftests/forms/input/checkbox/reftest.list 2021-03-25 15:40:12.155581841 +0100 ++++ firefox-87.0/layout/reftests/forms/input/checkbox/reftest.list 2021-03-25 18:32:51.617417752 +0100 @@ -18 +18 @@ -skip-if(OSX||winWidget) fails-if(geckoview&&webrender) fuzzy-if(gtkWidget&&nativeThemePref,25-25,32-32) fails-if(Android&&nativeThemePref) == checkbox-clamp-02.html checkbox-clamp-02-ref.html +skip-if(OSX||winWidget) fails-if(geckoview&&webrender) fuzzy-if(gtkWidget&&nativeThemePref,12-25,25-32) fails-if(Android) == checkbox-clamp-02.html checkbox-clamp-02-ref.html diff -U0 firefox-87.0/layout/reftests/forms/input/radio/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/forms/input/radio/reftest.list --- firefox-87.0/layout/reftests/forms/input/radio/reftest.list.firefox-tests-reftest 2021-03-18 14:49:00.000000000 +0100 -+++ firefox-87.0/layout/reftests/forms/input/radio/reftest.list 2021-03-25 15:40:12.155581841 +0100 ++++ firefox-87.0/layout/reftests/forms/input/radio/reftest.list 2021-03-25 18:32:51.617417752 +0100 @@ -9 +9 @@ -skip-if(OSX||winWidget||Android) fuzzy-if(gtkWidget&&nativeThemePref,24-24,16-16) == radio-clamp-02.html radio-clamp-02-ref.html # gtkWidget, Bug 1599622 +skip-if(OSX||winWidget||Android) fuzzy-if(gtkWidget&&nativeThemePref,10-24,16-16) == radio-clamp-02.html radio-clamp-02-ref.html # gtkWidget, Bug 1599622 diff -U0 firefox-87.0/layout/reftests/forms/placeholder/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/forms/placeholder/reftest.list --- firefox-87.0/layout/reftests/forms/placeholder/reftest.list.firefox-tests-reftest 2021-03-18 14:49:00.000000000 +0100 -+++ firefox-87.0/layout/reftests/forms/placeholder/reftest.list 2021-03-25 15:40:12.155581841 +0100 ++++ firefox-87.0/layout/reftests/forms/placeholder/reftest.list 2021-03-25 18:32:51.617417752 +0100 @@ -21 +21 @@ -fuzzy-if(winWidget,0-160,0-10) fuzzy-if(Android,0-160,0-41) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-146,0-317) fuzzy-if(OSX==1010&&browserIsRemote,0-1,0-8) == placeholder-6.html placeholder-overflow-ref.html +fuzzy-if(gtkWidget,0-255,0-341) fuzzy-if(winWidget,0-160,0-10) fuzzy-if(Android,0-160,0-41) fuzzy-if(OSX==1010&&browserIsRemote,0-1,0-8) == placeholder-6.html placeholder-overflow-ref.html diff -U0 firefox-87.0/layout/reftests/forms/textbox/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/forms/textbox/reftest.list --- firefox-87.0/layout/reftests/forms/textbox/reftest.list.firefox-tests-reftest 2021-03-18 14:49:00.000000000 +0100 -+++ firefox-87.0/layout/reftests/forms/textbox/reftest.list 2021-03-25 15:40:12.155581841 +0100 ++++ firefox-87.0/layout/reftests/forms/textbox/reftest.list 2021-03-25 18:32:51.617417752 +0100 @@ -4 +4 @@ -fuzzy-if(winWidget,0-1,0-3) skip-if(cocoaWidget||Android) fails-if(webrender) == chrome://reftest/content/forms/textbox/accesskey-2.xhtml chrome://reftest/content/forms/textbox/accesskey-2-ref.xhtml +fuzzy-if(gtkWidget,0-1,0-21) fuzzy-if(winWidget,0-1,0-3) skip-if(cocoaWidget||Android) fails-if(webrender) == chrome://reftest/content/forms/textbox/accesskey-2.xhtml chrome://reftest/content/forms/textbox/accesskey-2-ref.xhtml @@ -8 +8 @@ -fuzzy-if(winWidget,0-1,0-3) skip-if(cocoaWidget||Android) fails-if(webrender&&!Android) == chrome://reftest/content/forms/textbox/accesskey-4.xhtml chrome://reftest/content/forms/textbox/accesskey-4-ref.xhtml +fuzzy-if(gtkWidget,0-1,0-21) fuzzy-if(winWidget,0-1,0-3) skip-if(cocoaWidget||Android) fails-if(webrender&&!Android) == chrome://reftest/content/forms/textbox/accesskey-4.xhtml chrome://reftest/content/forms/textbox/accesskey-4-ref.xhtml +diff -U0 firefox-87.0/layout/reftests/generated-content/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/generated-content/reftest.list +--- firefox-87.0/layout/reftests/generated-content/reftest.list.firefox-tests-reftest 2021-03-18 14:49:00.000000000 +0100 ++++ firefox-87.0/layout/reftests/generated-content/reftest.list 2021-03-25 18:32:51.618417782 +0100 +@@ -16 +16 @@ +-fuzzy-if(OSX==1010,0-1,0-10) == quotes-001.xml quotes-001-ref.xml ++fuzzy(0-128,0-737) fuzzy-if(OSX==1010,0-1,0-10) == quotes-001.xml quotes-001-ref.xml diff -U0 firefox-87.0/layout/reftests/high-contrast/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/high-contrast/reftest.list --- firefox-87.0/layout/reftests/high-contrast/reftest.list.firefox-tests-reftest 2021-03-18 14:49:00.000000000 +0100 -+++ firefox-87.0/layout/reftests/high-contrast/reftest.list 2021-03-25 16:56:15.866094156 +0100 ++++ firefox-87.0/layout/reftests/high-contrast/reftest.list 2021-03-25 18:32:51.617417752 +0100 @@ -22 +22 @@ -fuzzy-if(cocoaWidget,255-255,1495-1495) fuzzy-if(winWidget,255-255,353-353) fuzzy-if(Android,255-255,700-700) == backplate-bg-image-010.html backplate-bg-image-010-ref.html +fuzzy-if(gtkWidget,0-255,0-1495) fuzzy-if(cocoaWidget,255-255,1495-1495) fuzzy-if(winWidget,255-255,353-353) fuzzy-if(Android,255-255,700-700) == backplate-bg-image-010.html backplate-bg-image-010-ref.html diff -U0 firefox-87.0/layout/reftests/indic-shaping/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/indic-shaping/reftest.list --- firefox-87.0/layout/reftests/indic-shaping/reftest.list.firefox-tests-reftest 2021-03-18 14:49:00.000000000 +0100 -+++ firefox-87.0/layout/reftests/indic-shaping/reftest.list 2021-03-25 15:40:12.156581872 +0100 ++++ firefox-87.0/layout/reftests/indic-shaping/reftest.list 2021-03-25 18:32:51.617417752 +0100 @@ -12 +11,0 @@ -fuzzy-if(gtkWidget,255-255,46-46) == gujarati-3b.html gujarati-3-ref.html # gtkWidget, Bug 1600777 diff -U0 firefox-87.0/layout/reftests/mathml/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/mathml/reftest.list --- firefox-87.0/layout/reftests/mathml/reftest.list.firefox-tests-reftest 2021-03-18 14:48:53.000000000 +0100 -+++ firefox-87.0/layout/reftests/mathml/reftest.list 2021-03-25 15:40:12.156581872 +0100 ++++ firefox-87.0/layout/reftests/mathml/reftest.list 2021-03-25 18:32:51.617417752 +0100 @@ -26 +26 @@ -random-if(smallScreen&&Android) fuzzy(0-255,0-200) fuzzy-if(geckoview&&webrender,201-216,312-316) fuzzy-if(webrender&&winWidget,114-255,245-361) fuzzy-if(webrender&&OSX,79-153,307-314) == mirror-op-1.html mirror-op-1-ref.html +random-if(smallScreen&&Android) fuzzy(0-255,0-350) fuzzy-if(geckoview&&webrender,201-216,312-316) fuzzy-if(webrender&&winWidget,114-255,245-361) fuzzy-if(webrender&&OSX,79-153,307-314) == mirror-op-1.html mirror-op-1-ref.html @@ -342,7 +354,7 @@ diff -U0 firefox-87.0/layout/reftests/mathml/reftest.list.firefox-tests-reftest -fails-if(winWidget) fuzzy-if(gtkWidget,255-255,776226-776226) == subscript-italic-correction.html subscript-italic-correction-ref.html # bug 961482 (Windows), bug 1599640 (Linux) diff -U0 firefox-87.0/layout/reftests/position-dynamic-changes/relative/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/position-dynamic-changes/relative/reftest.list --- firefox-87.0/layout/reftests/position-dynamic-changes/relative/reftest.list.firefox-tests-reftest 2021-03-18 14:49:01.000000000 +0100 -+++ firefox-87.0/layout/reftests/position-dynamic-changes/relative/reftest.list 2021-03-25 15:40:12.156581872 +0100 ++++ firefox-87.0/layout/reftests/position-dynamic-changes/relative/reftest.list 2021-03-25 18:32:51.617417752 +0100 @@ -1,4 +1,4 @@ -fuzzy-if(cocoaWidget,0-1,0-2) fuzzy-if(d2d,0-47,0-26) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-169,0-970) == move-right-bottom.html move-right-bottom-ref.html -fuzzy-if(cocoaWidget,0-1,0-2) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-169,0-970) == move-top-left.html move-top-left-ref.html # Bug 688545 @@ -354,7 +366,7 @@ diff -U0 firefox-87.0/layout/reftests/position-dynamic-changes/relative/reftest. +fuzzy-if(gtkWidget,0-103,0-637) fuzzy-if(cocoaWidget,0-1,0-3) == move-top-left-table.html move-top-left-table-ref.html # Bug 688545 diff -U0 firefox-87.0/layout/reftests/position-sticky/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/position-sticky/reftest.list --- firefox-87.0/layout/reftests/position-sticky/reftest.list.firefox-tests-reftest 2021-03-18 14:48:54.000000000 +0100 -+++ firefox-87.0/layout/reftests/position-sticky/reftest.list 2021-03-25 15:40:12.156581872 +0100 ++++ firefox-87.0/layout/reftests/position-sticky/reftest.list 2021-03-25 18:32:51.617417752 +0100 @@ -53,3 +53,2 @@ -fuzzy-if(Android,0-4,0-4) fuzzy-if(webrender&>kWidget,16-17,28-32) fuzzy-if(webrender&&cocoaWidget,8-8,38-42) skip-if(!asyncPan) == transformed-2.html transformed-2-ref.html # Bug 1604644 -skip-if(!asyncPan) fuzzy-if(Android,0-10,0-4) fuzzy-if(webrender&>kWidget,29-30,28-32) fuzzy-if(webrender&&cocoaWidget,15-16,44-44) == nested-sticky-1.html nested-sticky-1-ref.html # Bug 1604644 @@ -363,7 +375,7 @@ diff -U0 firefox-87.0/layout/reftests/position-sticky/reftest.list.firefox-tests +skip-if(!asyncPan) fuzzy-if(Android,0-10,0-4) fuzzy-if(webrender&>kWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,15-16,44-44) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),0-4,0-104) == nested-sticky-2.html nested-sticky-2-ref.html # Bug 1604644 diff -U0 firefox-87.0/layout/reftests/reftest-sanity/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/reftest-sanity/reftest.list --- firefox-87.0/layout/reftests/reftest-sanity/reftest.list.firefox-tests-reftest 2021-03-18 14:48:53.000000000 +0100 -+++ firefox-87.0/layout/reftests/reftest-sanity/reftest.list 2021-03-25 15:40:12.156581872 +0100 ++++ firefox-87.0/layout/reftests/reftest-sanity/reftest.list 2021-03-25 18:32:51.617417752 +0100 @@ -131,6 +131,6 @@ -pref(font.default.x-western,"serif") == font-serif.html font-default.html -pref(font.default.x-western,"serif") != font-sans-serif.html font-default.html @@ -379,7 +391,7 @@ diff -U0 firefox-87.0/layout/reftests/reftest-sanity/reftest.list.firefox-tests- +#fails pref(font.default.x-western,0) == font-serif.html font-default.html diff -U0 firefox-87.0/layout/reftests/svg/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/svg/reftest.list --- firefox-87.0/layout/reftests/svg/reftest.list.firefox-tests-reftest 2021-03-18 14:49:01.000000000 +0100 -+++ firefox-87.0/layout/reftests/svg/reftest.list 2021-03-25 15:40:12.156581872 +0100 ++++ firefox-87.0/layout/reftests/svg/reftest.list 2021-03-25 18:32:51.617417752 +0100 @@ -475 +475 @@ -random-if(winWidget) fuzzy-if(Android,0-10,0-2) == text-gradient-02.svg text-gradient-02-ref.svg # see bug 590101 +random-if(winWidget) fuzzy-if(gtkWidget,0-20,0-10) fuzzy-if(Android,0-10,0-2) == text-gradient-02.svg text-gradient-02-ref.svg # see bug 590101 @@ -393,13 +405,13 @@ diff -U0 firefox-87.0/layout/reftests/svg/reftest.list.firefox-tests-reftest fir +fuzzy(0-255,0-237) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == text-layout-09.svg pass.svg # Bug 1392106 diff -U0 firefox-87.0/layout/reftests/svg/smil/style/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/svg/smil/style/reftest.list --- firefox-87.0/layout/reftests/svg/smil/style/reftest.list.firefox-tests-reftest 2021-03-18 14:49:00.000000000 +0100 -+++ firefox-87.0/layout/reftests/svg/smil/style/reftest.list 2021-03-25 15:40:12.156581872 +0100 ++++ firefox-87.0/layout/reftests/svg/smil/style/reftest.list 2021-03-25 18:32:51.617417752 +0100 @@ -70 +70 @@ -random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(gtkWidget,255-255,1520-1520) == anim-css-font-1.svg anim-css-font-1-ref.svg # Windows: Bug 1392106 Linux: Bug 1599619 +random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == anim-css-font-1.svg anim-css-font-1-ref.svg # Windows: Bug 1392106 Linux: Bug 1599619 diff -U0 firefox-87.0/layout/reftests/svg/svg-integration/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/svg/svg-integration/reftest.list --- firefox-87.0/layout/reftests/svg/svg-integration/reftest.list.firefox-tests-reftest 2021-03-18 14:49:01.000000000 +0100 -+++ firefox-87.0/layout/reftests/svg/svg-integration/reftest.list 2021-03-25 15:40:12.156581872 +0100 ++++ firefox-87.0/layout/reftests/svg/svg-integration/reftest.list 2021-03-25 18:32:51.618417782 +0100 @@ -50 +50 @@ -fuzzy-if(Android,0-4,0-10) == box-decoration-break-01.xhtml box-decoration-break-01-ref.xhtml +fuzzy-if(gtkWidget,0-5,0-11) fuzzy-if(Android,0-4,0-10) == box-decoration-break-01.xhtml box-decoration-break-01-ref.xhtml @@ -408,7 +420,7 @@ diff -U0 firefox-87.0/layout/reftests/svg/svg-integration/reftest.list.firefox-t +fuzzy(0-67,0-254) == box-decoration-break-03.xhtml box-decoration-break-01-ref.xhtml diff -U0 firefox-87.0/layout/reftests/svg/text/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/svg/text/reftest.list --- firefox-87.0/layout/reftests/svg/text/reftest.list.firefox-tests-reftest 2021-03-18 14:48:53.000000000 +0100 -+++ firefox-87.0/layout/reftests/svg/text/reftest.list 2021-03-25 15:40:12.156581872 +0100 ++++ firefox-87.0/layout/reftests/svg/text/reftest.list 2021-03-25 18:32:51.618417782 +0100 @@ -203,2 +203,2 @@ -fuzzy-if(skiaContent,0-1,0-100) needs-focus fuzzy-if(webrender&&winWidget,134-148,261-318) == simple-bidi-selection.svg simple-bidi-selection-ref.html -fuzzy-if(skiaContent,0-1,0-50) needs-focus fuzzy-if(webrender&&winWidget,127-148,221-254) fuzzy-if(webrender&&OSX,1-65,19-196) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html @@ -416,7 +428,7 @@ diff -U0 firefox-87.0/layout/reftests/svg/text/reftest.list.firefox-tests-reftes +fuzzy-if(skiaContent,0-1,0-70) needs-focus fuzzy-if(webrender&&winWidget,127-148,221-254) fuzzy-if(webrender&&OSX,1-65,19-196) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html diff -U0 firefox-87.0/layout/reftests/tab-size/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/tab-size/reftest.list --- firefox-87.0/layout/reftests/tab-size/reftest.list.firefox-tests-reftest 2021-03-18 14:49:01.000000000 +0100 -+++ firefox-87.0/layout/reftests/tab-size/reftest.list 2021-03-25 15:40:12.156581872 +0100 ++++ firefox-87.0/layout/reftests/tab-size/reftest.list 2021-03-25 18:32:51.618417782 +0100 @@ -2,6 +2,6 @@ -== tab-size-8.html spaces-8.html -== tab-size-4.html spaces-4.html @@ -432,7 +444,7 @@ diff -U0 firefox-87.0/layout/reftests/tab-size/reftest.list.firefox-tests-reftes +fuzzy-if(gtkWidget,0-255,0-63) == tab-size-1.html spaces-1.html diff -U0 firefox-87.0/layout/reftests/text-decoration/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/text-decoration/reftest.list --- firefox-87.0/layout/reftests/text-decoration/reftest.list.firefox-tests-reftest 2021-03-18 14:49:00.000000000 +0100 -+++ firefox-87.0/layout/reftests/text-decoration/reftest.list 2021-03-25 15:40:12.156581872 +0100 ++++ firefox-87.0/layout/reftests/text-decoration/reftest.list 2021-03-25 18:32:51.618417782 +0100 @@ -1,2 +1,2 @@ -fuzzy-if(webrender&>kWidget,0-208,0-12) == complex-decoration-style-quirks.html complex-decoration-style-quirks-ref.html -fuzzy-if(webrender&>kWidget,0-208,0-12) == complex-decoration-style-standards.html complex-decoration-style-standards-ref.html @@ -440,7 +452,7 @@ diff -U0 firefox-87.0/layout/reftests/text-decoration/reftest.list.firefox-tests +fuzzy-if(gtkWidget,0-255,0-40) == complex-decoration-style-standards.html complex-decoration-style-standards-ref.html diff -U0 firefox-87.0/layout/reftests/text-overflow/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/text-overflow/reftest.list --- firefox-87.0/layout/reftests/text-overflow/reftest.list.firefox-tests-reftest 2021-03-18 14:49:01.000000000 +0100 -+++ firefox-87.0/layout/reftests/text-overflow/reftest.list 2021-03-25 15:40:12.156581872 +0100 ++++ firefox-87.0/layout/reftests/text-overflow/reftest.list 2021-03-25 18:32:51.618417782 +0100 @@ -6 +6 @@ -skip-if(!gtkWidget) fuzzy-if(gtkWidget,0-124,0-289) == bidi-simple-scrolled.html bidi-simple-scrolled-ref.html # Fails on Windows and OSX due to anti-aliasing +skip-if(!gtkWidget) fuzzy-if(gtkWidget,0-255,0-400) == bidi-simple-scrolled.html bidi-simple-scrolled-ref.html # Fails on Windows and OSX due to anti-aliasing @@ -449,7 +461,7 @@ diff -U0 firefox-87.0/layout/reftests/text-overflow/reftest.list.firefox-tests-r +fuzzy-if(gtkWidget,0-255,0-294) == float-edges-1.html float-edges-1-ref.html diff -U0 firefox-87.0/layout/reftests/text/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/text/reftest.list --- firefox-87.0/layout/reftests/text/reftest.list.firefox-tests-reftest 2021-03-18 14:48:53.000000000 +0100 -+++ firefox-87.0/layout/reftests/text/reftest.list 2021-03-25 17:01:11.478993098 +0100 ++++ firefox-87.0/layout/reftests/text/reftest.list 2021-03-25 18:32:51.618417782 +0100 @@ -192 +192 @@ -fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1320665-cmap-format-13.html 1320665-cmap-format-13-ref.html # see bug 1320665 comments 8-9 +fuzzy-if(gtkWidget,0-255,0-1071) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1320665-cmap-format-13.html 1320665-cmap-format-13-ref.html # see bug 1320665 comments 8-9 @@ -466,13 +478,13 @@ diff -U0 firefox-87.0/layout/reftests/text/reftest.list.firefox-tests-reftest fi +fuzzy-if(gtkWidget,0-5,0-5) == color-opacity-rtl-1.html color-opacity-rtl-1-ref.html diff -U0 firefox-87.0/layout/reftests/text-transform/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/text-transform/reftest.list --- firefox-87.0/layout/reftests/text-transform/reftest.list.firefox-tests-reftest 2021-03-18 14:48:53.000000000 +0100 -+++ firefox-87.0/layout/reftests/text-transform/reftest.list 2021-03-25 15:40:12.157581902 +0100 ++++ firefox-87.0/layout/reftests/text-transform/reftest.list 2021-03-25 18:32:51.618417782 +0100 @@ -15 +15 @@ -random-if(winWidget) == small-caps-1.html small-caps-1-ref.html # fails if default font supports 'smcp' +fuzzy-if(gtkWidget,0-255,0-571) random-if(winWidget) == small-caps-1.html small-caps-1-ref.html # fails if default font supports 'smcp' diff -U0 firefox-87.0/layout/reftests/transform-3d/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/transform-3d/reftest.list --- firefox-87.0/layout/reftests/transform-3d/reftest.list.firefox-tests-reftest 2021-03-18 14:49:01.000000000 +0100 -+++ firefox-87.0/layout/reftests/transform-3d/reftest.list 2021-03-25 17:01:36.990761086 +0100 ++++ firefox-87.0/layout/reftests/transform-3d/reftest.list 2021-03-25 18:32:51.618417782 +0100 @@ -14 +14 @@ -fuzzy-if(gtkWidget||winWidget,0-8,0-376) fuzzy-if(Android,0-8,0-441) fuzzy-if(cocoaWidget,0-17,0-4) fuzzy-if(skiaContent,0-16,0-286) fuzzy-if(webrender&&cocoaWidget,0-200,0-310) fuzzy-if(webrender&&winWidget,0-175,0-250) == preserve3d-1a.html preserve3d-1-ref.html +fuzzy-if(gtkWidget,0-16,0-500) == preserve3d-1a.html preserve3d-1-ref.html @@ -491,7 +503,7 @@ diff -U0 firefox-87.0/layout/reftests/transform-3d/reftest.list.firefox-tests-re +fuzzy-if(webrender,0-6,0-3500) == 1637067-1.html 1637067-1-ref.html diff -U0 firefox-87.0/layout/reftests/writing-mode/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/writing-mode/reftest.list --- firefox-87.0/layout/reftests/writing-mode/reftest.list.firefox-tests-reftest 2021-03-18 14:49:01.000000000 +0100 -+++ firefox-87.0/layout/reftests/writing-mode/reftest.list 2021-03-25 15:40:12.157581902 +0100 ++++ firefox-87.0/layout/reftests/writing-mode/reftest.list 2021-03-25 18:32:51.618417782 +0100 @@ -20 +20 @@ -random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1091058-1.html 1091058-1-ref.html # Bug 1392106 +fuzzy(0-255,0-315) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1091058-1.html 1091058-1-ref.html # Bug 1392106 @@ -509,7 +521,7 @@ diff -U0 firefox-87.0/layout/reftests/writing-mode/reftest.list.firefox-tests-re +fuzzy-if(gtkWidget,0-248,0-8) == 1395926-vertical-upright-gpos-1.html 1395926-vertical-upright-gpos-1-ref.html diff -U0 firefox-87.0/layout/reftests/writing-mode/tables/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/writing-mode/tables/reftest.list --- firefox-87.0/layout/reftests/writing-mode/tables/reftest.list.firefox-tests-reftest 2021-03-18 14:48:54.000000000 +0100 -+++ firefox-87.0/layout/reftests/writing-mode/tables/reftest.list 2021-03-25 15:40:12.157581902 +0100 ++++ firefox-87.0/layout/reftests/writing-mode/tables/reftest.list 2021-03-25 18:32:51.618417782 +0100 @@ -34 +34 @@ -== fixed-table-layout-027-vlr.html fixed-table-layout-025-ref.html +fuzzy-if(gtkWidget,0-260,0-250) == fixed-table-layout-027-vlr.html fixed-table-layout-025-ref.html @@ -521,19 +533,13 @@ diff -U0 firefox-87.0/layout/reftests/writing-mode/tables/reftest.list.firefox-t -fuzzy-if(Android,0-255,0-38) pref(layout.css.caption-side-non-standard.enabled,true) == table-caption-bottom-1.html table-caption-bottom-1-ref.html diff -U0 firefox-87.0/layout/reftests/xul/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/xul/reftest.list --- firefox-87.0/layout/reftests/xul/reftest.list.firefox-tests-reftest 2021-03-18 14:48:54.000000000 +0100 -+++ firefox-87.0/layout/reftests/xul/reftest.list 2021-03-25 15:40:12.157581902 +0100 ++++ firefox-87.0/layout/reftests/xul/reftest.list 2021-03-25 18:32:51.618417782 +0100 @@ -15 +15 @@ -random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == chrome://reftest/content/xul/text-small-caps-1.xhtml chrome://reftest/content/xul/text-small-caps-1-ref.xhtml +fuzzy-if(gtkWidget,0-255,0-5159) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == chrome://reftest/content/xul/text-small-caps-1.xhtml chrome://reftest/content/xul/text-small-caps-1-ref.xhtml diff -U0 firefox-87.0/layout/xul/reftest/reftest.list.firefox-tests-reftest firefox-87.0/layout/xul/reftest/reftest.list --- firefox-87.0/layout/xul/reftest/reftest.list.firefox-tests-reftest 2021-03-18 14:48:54.000000000 +0100 -+++ firefox-87.0/layout/xul/reftest/reftest.list 2021-03-25 15:40:12.157581902 +0100 ++++ firefox-87.0/layout/xul/reftest/reftest.list 2021-03-25 18:32:51.618417782 +0100 @@ -14 +14 @@ -fuzzy(0-10,0-75) == chrome://reftest/content/xul/reftest/scrollbar-marks-overlay.html chrome://reftest/content/xul/reftest/scrollbar-marks-overlay-ref.html +fuzzy(0-10,0-90) == chrome://reftest/content/xul/reftest/scrollbar-marks-overlay.html chrome://reftest/content/xul/reftest/scrollbar-marks-overlay-ref.html -diff -U0 firefox-87.0/layout/reftests/generated-content/reftest.list.reff firefox-87.0/layout/reftests/generated-content/reftest.list ---- firefox-87.0/layout/reftests/generated-content/reftest.list.reff 2021-03-25 16:54:22.633685009 +0100 -+++ firefox-87.0/layout/reftests/generated-content/reftest.list 2021-03-25 16:54:58.913777638 +0100 -@@ -16 +16 @@ --fuzzy-if(OSX==1010,0-1,0-10) == quotes-001.xml quotes-001-ref.xml -+fuzzy(0-128,0-737) fuzzy-if(OSX==1010,0-1,0-10) == quotes-001.xml quotes-001-ref.xml diff --git a/firefox.spec b/firefox.spec index b40806e..7d77fbb 100644 --- a/firefox.spec +++ b/firefox.spec @@ -39,12 +39,6 @@ ExcludeArch: s390x # https://bugzilla.redhat.com/show_bug.cgi?id=1942516 ExcludeArch: armv7hl -# Temporary disable due to -# https://bugzilla.redhat.com/show_bug.cgi?id=1933742 -%if 0%{?fedora} > 33 -ExcludeArch: ppc64le -%endif - # Temporary disable tests on Rawhide/arm/i686 due to failures %if 0%{?fedora} > 33 %ifarch armv7hl @@ -74,6 +68,11 @@ ExcludeArch: ppc64le %global debug_package %{nil} %global enable_mozilla_crashreporter 0 %endif +# Temporary disabled due to +# https://bugzilla.redhat.com/show_bug.cgi?id=1922744 +%if 0%{?fedora} > 33 +%global enable_mozilla_crashreporter 0 +%endif %global system_ffi 1 %ifarch armv7hl @@ -177,7 +176,7 @@ ExcludeArch: ppc64le Summary: Mozilla Firefox Web browser Name: firefox Version: 87.0 -Release: 3%{?pre_tag}%{?dist} +Release: 4%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz @@ -232,6 +231,7 @@ Patch55: firefox-testing.patch Patch56: mozilla-1686888.patch Patch57: firefox-disable-ffvpx-with-vapi.patch Patch58: firefox-crashreporter-build.patch +Patch59: mozilla-1700520.patch # Test patches # Generate without context by @@ -373,6 +373,7 @@ BuildRequires: google-noto-sans-cjk-ttc-fonts BuildRequires: google-noto-sans-gurmukhi-fonts BuildRequires: google-noto-sans-fonts BuildRequires: google-noto-emoji-color-fonts +BuildRequires: google-noto-sans-sinhala-vf-fonts # ----------------------------------- BuildRequires: thai-scalable-fonts-common BuildRequires: thai-scalable-waree-fonts @@ -477,6 +478,7 @@ This package contains results of tests executed during build. %patch56 -p1 -b .1686888-dump-syms %patch57 -p1 -b .ffvpx-with-vapi %patch58 -p1 -b .firefox-crashreporter-build +%patch59 -p1 -b .1700520 # Test patches %patch100 -p1 -b .firefox-tests-xpcshell @@ -1074,8 +1076,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Thu Mar 25 2021 Martin Stransky <stransky@redhat.com> - 87.0-3 -- Enable crashreporter on Fedora 34+ +* Fri Mar 26 2021 Martin Stransky <stransky@redhat.com> - 87.0-4 +- More test fixes +- Enabled ppc64le +- Disabled crashreporter on Fedora 34+ * Wed Mar 24 2021 Martin Stransky <stransky@redhat.com> - 87.0-2 - More test fixes diff --git a/mozilla-1700520.patch b/mozilla-1700520.patch new file mode 100644 index 0000000..c93cbe2 --- /dev/null +++ b/mozilla-1700520.patch @@ -0,0 +1,51 @@ +diff --git a/gfx/wr/swgl/src/blend.h b/gfx/wr/swgl/src/blend.h +--- a/gfx/wr/swgl/src/blend.h ++++ b/gfx/wr/swgl/src/blend.h +@@ -405,7 +405,7 @@ + blend_key = BlendKey(AA_BLEND_KEY_NONE + blend_key); + } + +-static ALWAYS_INLINE WideRGBA8 blend_pixels(uint32_t* buf, PackedRGBA8 pdst, ++static PREFER_INLINE WideRGBA8 blend_pixels(uint32_t* buf, PackedRGBA8 pdst, + WideRGBA8 src, int span = 4) { + WideRGBA8 dst = unpack(pdst); + const WideRGBA8 RGB_MASK = {0xFFFF, 0xFFFF, 0xFFFF, 0, 0xFFFF, 0xFFFF, +@@ -686,7 +686,7 @@ + // clang-format on + } + +-static ALWAYS_INLINE WideR8 blend_pixels(uint8_t* buf, WideR8 dst, WideR8 src, ++static PREFER_INLINE WideR8 blend_pixels(uint8_t* buf, WideR8 dst, WideR8 src, + int span = 4) { + // clang-format off + #define BLEND_CASE_KEY(key) \ +diff --git a/gfx/wr/swgl/src/gl.cc b/gfx/wr/swgl/src/gl.cc +--- a/gfx/wr/swgl/src/gl.cc ++++ b/gfx/wr/swgl/src/gl.cc +@@ -58,10 +58,24 @@ + } + + #else +-# define ALWAYS_INLINE __attribute__((always_inline)) inline ++// GCC is slower when dealing with always_inline, especially in debug builds. ++// When using Clang, use always_inline more aggressively. ++# if defined(__clang__) || defined(NDEBUG) ++# define ALWAYS_INLINE __attribute__((always_inline)) inline ++# else ++# define ALWAYS_INLINE inline ++# endif + # define NO_INLINE __attribute__((noinline)) + #endif + ++// Some functions may cause excessive binary bloat if inlined in debug or with ++// GCC builds, so use PREFER_INLINE on these instead of ALWAYS_INLINE. ++#if defined(__clang__) && defined(NDEBUG) ++# define PREFER_INLINE ALWAYS_INLINE ++#else ++# define PREFER_INLINE inline ++#endif ++ + #define UNREACHABLE __builtin_unreachable() + + #define UNUSED [[maybe_unused]] + diff --git a/print-errors b/print-errors index 1a41eff..8a417c8 100755 --- a/print-errors +++ b/print-errors @@ -5,5 +5,5 @@ TEST_DIR=$1 TEST_FLAVOUR=$2 #grep "TEST-UNEXPECTED-FAIL" $TEST_DIR/mochitest$TEST_FLAVOUR 2>&1 > failures-mochitest$TEST_FLAVOUR.txt -grep --text " FAIL " $TEST_DIR/xpcshell$TEST_FLAVOUR 2>&1 > failures-xpcshell$TEST_FLAVOUR.txt +grep --text -e " FAIL " -e " TIMEOUT " $TEST_DIR/xpcshell$TEST_FLAVOUR 2>&1 > failures-xpcshell$TEST_FLAVOUR.txt grep --text -e "REFTEST TEST-UNEXPECTED-PASS" -e "REFTEST TEST-UNEXPECTED-FAIL" $TEST_DIR/reftest$TEST_FLAVOUR 2>&1 > failures-reftest$TEST_FLAVOUR.txt |