Auto merge of #6619 - servo:css, r=SimonSapin

Update the test-css expectations for the OSX update.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6619)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-13 21:11:46 -06:00
commit 03232aca3e
30 changed files with 30 additions and 60 deletions

View file

@ -1,4 +1,3 @@
[bidi-inline-002.htm] [bidi-inline-002.htm]
type: reftest type: reftest
expected: expected: FAIL
FAIL

View file

@ -1,5 +1,4 @@
[color-applies-to-001.htm] [color-applies-to-001.htm]
type: reftest type: reftest
expected: expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL if (os == "mac"): FAIL
if (os == "mac") and (version == "OS X 10.10.3"): FAIL

View file

@ -1,5 +1,4 @@
[color-applies-to-002.htm] [color-applies-to-002.htm]
type: reftest type: reftest
expected: expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL if (os == "mac"): FAIL
if (os == "mac") and (version == "OS X 10.10.3"): FAIL

View file

@ -1,5 +1,4 @@
[color-applies-to-003.htm] [color-applies-to-003.htm]
type: reftest type: reftest
expected: expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL if (os == "mac"): FAIL
if (os == "mac") and (version == "OS X 10.10.3"): FAIL

View file

@ -1,5 +1,4 @@
[color-applies-to-004.htm] [color-applies-to-004.htm]
type: reftest type: reftest
expected: expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL if (os == "mac"): FAIL
if (os == "mac") and (version == "OS X 10.10.3"): FAIL

View file

@ -1,5 +1,4 @@
[color-applies-to-005.htm] [color-applies-to-005.htm]
type: reftest type: reftest
expected: expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL if (os == "mac"): FAIL
if (os == "mac") and (version == "OS X 10.10.3"): FAIL

View file

@ -1,5 +1,4 @@
[color-applies-to-006.htm] [color-applies-to-006.htm]
type: reftest type: reftest
expected: expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL if (os == "mac"): FAIL
if (os == "mac") and (version == "OS X 10.10.3"): FAIL

View file

@ -1,5 +1,4 @@
[color-applies-to-013.htm] [color-applies-to-013.htm]
type: reftest type: reftest
expected: expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL if (os == "mac"): FAIL
if (os == "mac") and (version == "OS X 10.10.3"): FAIL

View file

@ -1,5 +1,4 @@
[color-applies-to-015.htm] [color-applies-to-015.htm]
type: reftest type: reftest
expected: expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL if (os == "mac"): FAIL
if (os == "mac") and (version == "OS X 10.10.3"): FAIL

View file

@ -1,6 +1,5 @@
[content-177.htm] [content-177.htm]
type: reftest type: reftest
expected: expected:
if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS if (os == "mac"): PASS
if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
FAIL FAIL

View file

@ -1,5 +1,4 @@
[display-008.htm] [display-008.htm]
type: reftest type: reftest
expected: expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL if (os == "mac"): FAIL
if (os == "mac") and (version == "OS X 10.10.3"): FAIL

View file

@ -1,5 +1,4 @@
[display-009.htm] [display-009.htm]
type: reftest type: reftest
expected: expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL if (os == "mac"): FAIL
if (os == "mac") and (version == "OS X 10.10.3"): FAIL

View file

@ -1,5 +1,4 @@
[float-applies-to-008.htm] [float-applies-to-008.htm]
type: reftest type: reftest
expected: expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL if (os == "mac"): FAIL
if (os == "mac") and (version == "OS X 10.10.3"): FAIL

View file

@ -1,6 +1,5 @@
[font-size-001.htm] [font-size-001.htm]
type: reftest type: reftest
expected: expected:
if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS if (os == "mac"): PASS
if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
FAIL FAIL

View file

@ -1,6 +1,5 @@
[font-size-002.htm] [font-size-002.htm]
type: reftest type: reftest
expected: expected:
if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS if (os == "mac"): PASS
if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
FAIL FAIL

View file

@ -1,6 +1,5 @@
[font-size-004.htm] [font-size-004.htm]
type: reftest type: reftest
expected: expected:
if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS if (os == "mac"): PASS
if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
FAIL FAIL

View file

@ -1,6 +1,5 @@
[font-size-005.htm] [font-size-005.htm]
type: reftest type: reftest
expected: expected:
if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS if (os == "mac"): PASS
if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
FAIL FAIL

View file

@ -1,6 +1,5 @@
[font-size-089.htm] [font-size-089.htm]
type: reftest type: reftest
expected: expected:
if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS if (os == "mac"): PASS
if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
FAIL FAIL

View file

@ -1,6 +1,5 @@
[font-size-090.htm] [font-size-090.htm]
type: reftest type: reftest
expected: expected:
if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS if (os == "mac"): PASS
if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
FAIL FAIL

View file

@ -1,6 +1,5 @@
[font-size-092.htm] [font-size-092.htm]
type: reftest type: reftest
expected: expected:
if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS if (os == "mac"): PASS
if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
FAIL FAIL

View file

@ -1,6 +1,5 @@
[font-size-093.htm] [font-size-093.htm]
type: reftest type: reftest
expected: expected:
if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS if (os == "mac"): PASS
if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
FAIL FAIL

View file

@ -1,6 +1,5 @@
[font-size-100.htm] [font-size-100.htm]
type: reftest type: reftest
expected: expected:
if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS if (os == "mac"): PASS
if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
FAIL FAIL

View file

@ -1,6 +1,5 @@
[font-size-101.htm] [font-size-101.htm]
type: reftest type: reftest
expected: expected:
if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS if (os == "mac"): PASS
if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
FAIL FAIL

View file

@ -1,6 +1,5 @@
[font-size-102.htm] [font-size-102.htm]
type: reftest type: reftest
expected: expected:
if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS if (os == "mac"): PASS
if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
FAIL FAIL

View file

@ -1,5 +1,4 @@
[inline-block-zorder-003.htm] [inline-block-zorder-003.htm]
type: reftest type: reftest
expected: expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL if (os == "mac"): FAIL
if (os == "mac") and (version == "OS X 10.10.3"): FAIL

View file

@ -1,5 +1,4 @@
[inline-formatting-context-004.htm] [inline-formatting-context-004.htm]
type: reftest type: reftest
expected: expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL if (os == "mac"): FAIL
if (os == "mac") and (version == "OS X 10.10.3"): FAIL

View file

@ -1,5 +1,4 @@
[inline-formatting-context-005.htm] [inline-formatting-context-005.htm]
type: reftest type: reftest
expected: expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL if (os == "mac"): FAIL
if (os == "mac") and (version == "OS X 10.10.3"): FAIL

View file

@ -1,4 +1,3 @@
[inline-formatting-context-023.htm] [inline-formatting-context-023.htm]
type: reftest type: reftest
expected: expected: FAIL
FAIL

View file

@ -1,6 +1,5 @@
[line-height-121.htm] [line-height-121.htm]
type: reftest type: reftest
expected: expected:
if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS if (os == "mac"): PASS
if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
FAIL FAIL

View file

@ -1,6 +1,5 @@
[line-height-127.htm] [line-height-127.htm]
type: reftest type: reftest
expected: expected:
if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS if (os == "mac"): PASS
if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS
FAIL FAIL