Bug 1056479 p3 - fixup various reftests for Linux. r=jfkthame

This commit is contained in:
John Daggett 2015-05-12 17:44:20 +09:00
Родитель da0662d19f
Коммит 197c2170e0
4 изменённых файлов: 17 добавлений и 16 удалений

Просмотреть файл

@ -102,7 +102,7 @@ load 783041-1.html
load 783041-2.html load 783041-2.html
load 783041-3.html load 783041-3.html
load 783041-4.html load 783041-4.html
asserts-if(gtk2Widget,1) load 798853.html # bug 868792 load 798853.html # bug 868792
asserts-if(winWidget,0-1) skip-if(B2G) load 815489.html asserts-if(winWidget,0-1) skip-if(B2G) load 815489.html
load 836225-1.html load 836225-1.html
load 839745-1.html load 839745-1.html

Просмотреть файл

@ -43,14 +43,15 @@ skip-if(B2G||Mulet) HTTP(..) == src-list-actual-font-ref.html src-list-data-1.ht
# localized full fontnames should *not* match, only English ones (need locale-invariant key) # localized full fontnames should *not* match, only English ones (need locale-invariant key)
skip HTTP(..) == src-list-local-localized.html src-list-local-localized-ref.html # 486787, 486497 skip HTTP(..) == src-list-local-localized.html src-list-local-localized-ref.html # 486787, 486497
# Postscript name lookup only supported on MacOS/Windows currently # postscript name lookup
skip-if(B2G||Mulet) fails-if(Android) random-if(gtk2Widget) == src-list-local-ps.html src-list-local-full-ref.html # bug 773482 # Initial mulet triage: parity with B2G/B2G Desktop # fontconfig only supports postscript name lookup from 2.10.92, Android/B2G not supported
skip-if(B2G||Mulet) fails-if(Android) random-if(gtk2Widget) == src-list-local-ps.html src-list-local-full-ref.html # bug 773482
# Mac-specific test of 100 weight faces # Mac-specific test of 100 weight faces
random-if(!cocoaWidget) == helveticaneue-ultra.html helveticaneue-ultra-ref.html random-if(!cocoaWidget) == helveticaneue-ultra.html helveticaneue-ultra-ref.html
HTTP(..) == order-1.html order-1-ref.html HTTP(..) == order-1.html order-1-ref.html
pref(layout.css.unicode-range.enabled,true) random-if(gtk2Widget) HTTP(..) == order-2.html order-2-ref.html # bug 1056479 pref(layout.css.unicode-range.enabled,true) HTTP(..) == order-2.html order-2-ref.html
pref(layout.css.unicode-range.enabled,true) random-if(gtk2Widget) HTTP(..) == order-3.html order-3-ref.html # bug 1056479 pref(layout.css.unicode-range.enabled,true) HTTP(..) == order-3.html order-3-ref.html
HTTP(..) == multiple-in-family-1.html multiple-in-family-1-ref.html HTTP(..) == multiple-in-family-1.html multiple-in-family-1-ref.html
HTTP(..) == multiple-in-family-1b.html multiple-in-family-1-ref.html HTTP(..) == multiple-in-family-1b.html multiple-in-family-1-ref.html
HTTP(..) != multiple-in-family-1.html multiple-in-family-1-notref.html HTTP(..) != multiple-in-family-1.html multiple-in-family-1-notref.html
@ -59,11 +60,11 @@ HTTP(..) == prop-order-over-rule-order-1b.html prop-order-over-rule-order-2b.htm
HTTP(..) != prop-order-over-rule-order-1a.html prop-order-over-rule-order-1b.html HTTP(..) != prop-order-over-rule-order-1a.html prop-order-over-rule-order-1b.html
skip-if(B2G||Mulet) HTTP(..) == cross-iframe-1.html cross-iframe-1-ref.html # bug 773482 # Initial mulet triage: parity with B2G/B2G Desktop skip-if(B2G||Mulet) HTTP(..) == cross-iframe-1.html cross-iframe-1-ref.html # bug 773482 # Initial mulet triage: parity with B2G/B2G Desktop
# unicode-range (Linux implementation - bug 1056479) # unicode-range
pref(layout.css.unicode-range.enabled,true) random-if(gtk2Widget) HTTP(..) == unicoderange-1.html unicoderange-1-ref.html pref(layout.css.unicode-range.enabled,true) HTTP(..) == unicoderange-1.html unicoderange-1-ref.html
pref(layout.css.unicode-range.enabled,true) random-if(gtk2Widget) HTTP(..) == unicoderange-2.html unicoderange-2-ref.html pref(layout.css.unicode-range.enabled,true) HTTP(..) == unicoderange-2.html unicoderange-2-ref.html
pref(layout.css.unicode-range.enabled,true) random-if(gtk2Widget) HTTP(..) == unicoderange-3.html unicoderange-3-ref.html pref(layout.css.unicode-range.enabled,true) HTTP(..) == unicoderange-3.html unicoderange-3-ref.html
pref(layout.css.unicode-range.enabled,true) random-if(gtk2Widget) HTTP(..) == unicoderange-4.html unicoderange-4-ref.html pref(layout.css.unicode-range.enabled,true) HTTP(..) == unicoderange-4.html unicoderange-4-ref.html
# Dynamic changes # Dynamic changes
# we need to skip these because of the bug that's causing order-2.html to fail # we need to skip these because of the bug that's causing order-2.html to fail

Просмотреть файл

@ -15,18 +15,18 @@ body {
@font-face { @font-face {
font-family: test-regular; font-family: test-regular;
src: local("Helvetica Neue"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("Free Sans"), local("SwissA"), local("DejaVu Sans"), local("Arial"); src: local("Helvetica Neue"), local("Bitstream Vera Sans"), local("Bitstream Vera Sans Roman"), local("FreeSans"), local("Free Sans"), local("SwissA"), local("DejaVu Sans"), local("Arial");
} }
/* use Helvetica on the Mac, since Futura has no bold face on 10.4, 10.5 */ /* use Helvetica on the Mac, since Futura has no bold face on 10.4, 10.5 */
@font-face { @font-face {
font-family: test-bold; font-family: test-bold;
src: local("Helvetica Neue Bold"), local("Bitstream Vera Sans Bold"), local("Free Sans Bold"), local("SwissA Bold"), local("DejaVu Sans Bold"), local("Arial Bold"); src: local("Helvetica Neue Bold"), local("Bitstream Vera Sans Bold"), local("FreeSans Bold"), local("Free Sans Bold"), local("SwissA Bold"), local("DejaVu Sans Bold"), local("Arial Bold");
} }
@font-face { @font-face {
font-family: test-italic; font-family: test-italic;
src: local("Helvetica Neue Italic"), local("Bitstream Vera Sans Oblique"), local("Free Sans Oblique"), local("SwissA Italic"), local("DejaVu Sans Oblique"), local("Arial Italic"); src: local("Helvetica Neue Italic"), local("Bitstream Vera Sans Oblique"), local("FreeSans Oblique"), local("Free Sans Oblique"), local("SwissA Italic"), local("DejaVu Sans Oblique"), local("Arial Italic");
} }
.regular { font-family: test-regular, serif; } .regular { font-family: test-regular, serif; }

Просмотреть файл

@ -15,18 +15,18 @@ body {
@font-face { @font-face {
font-family: test-regular; font-family: test-regular;
src: local(Helvetica Neue), local(Bitstream Vera Sans), local(Bitstream Vera Sans Roman), local(Free Sans), local(SwissA), local(DejaVu Sans), local(Arial); src: local(Helvetica Neue), local(Bitstream Vera Sans), local(Bitstream Vera Sans Roman), local(FreeSans), local(Free Sans), local(SwissA), local(DejaVu Sans), local(Arial);
} }
/* use Helvetica on the Mac, since Futura has no bold face on 10.4, 10.5 */ /* use Helvetica on the Mac, since Futura has no bold face on 10.4, 10.5 */
@font-face { @font-face {
font-family: test-bold; font-family: test-bold;
src: local(Helvetica Neue Bold), local(Bitstream Vera Sans Bold), local(Free Sans Bold), local(SwissA Bold), local(DejaVu Sans Bold), local(Arial Bold); src: local(Helvetica Neue Bold), local(Bitstream Vera Sans Bold), local(FreeSans Bold), local(Free Sans Bold), local(SwissA Bold), local(DejaVu Sans Bold), local(Arial Bold);
} }
@font-face { @font-face {
font-family: test-italic; font-family: test-italic;
src: local(Helvetica Neue Italic), local(Bitstream Vera Sans Oblique), local(Free Sans Oblique), local(SwissA Italic), local(DejaVu Sans Oblique), local(Arial Italic); src: local(Helvetica Neue Italic), local(Bitstream Vera Sans Oblique), local(FreeSans Oblique), local(Free Sans Oblique), local(SwissA Italic), local(DejaVu Sans Oblique), local(Arial Italic);
} }
.regular { font-family: test-regular, serif; } .regular { font-family: test-regular, serif; }