diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-07-13 21:11:46 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-07-13 21:11:46 -0600 |
| commit | 03232aca3e1b4e66b939ca0a7e42c980f452fb8e (patch) | |
| tree | 64450810e659d6f5b3c8f9fe9c865e86849c884e | |
| parent | 12195a5c4ac08f1e6eeaf8888c279fea8e5be48a (diff) | |
| parent | 365937160d1cac0f0102bdf1a070d0f265aca631 (diff) | |
| download | servo-03232aca3e1b4e66b939ca0a7e42c980f452fb8e.tar.gz servo-03232aca3e1b4e66b939ca0a7e42c980f452fb8e.zip | |
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 -->
30 files changed, 30 insertions, 60 deletions
diff --git a/tests/wpt/metadata-css/css21_dev/html4/bidi-inline-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/bidi-inline-002.htm.ini index 8799559f606..c7786c737b7 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/bidi-inline-002.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/bidi-inline-002.htm.ini @@ -1,4 +1,3 @@ [bidi-inline-002.htm] type: reftest - expected: - FAIL + expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-001.htm.ini index ab3603941f4..ba414f439d7 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-001.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-001.htm.ini @@ -1,5 +1,4 @@ [color-applies-to-001.htm] type: reftest expected: - if (os == "mac") and (version == "OS X 10.8.5"): FAIL - if (os == "mac") and (version == "OS X 10.10.3"): FAIL + if (os == "mac"): FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-002.htm.ini index 60a49fe7aaa..344a81e5d9d 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-002.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-002.htm.ini @@ -1,5 +1,4 @@ [color-applies-to-002.htm] type: reftest expected: - if (os == "mac") and (version == "OS X 10.8.5"): FAIL - if (os == "mac") and (version == "OS X 10.10.3"): FAIL + if (os == "mac"): FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-003.htm.ini index cde9f232998..b8b1b0ca390 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-003.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-003.htm.ini @@ -1,5 +1,4 @@ [color-applies-to-003.htm] type: reftest expected: - if (os == "mac") and (version == "OS X 10.8.5"): FAIL - if (os == "mac") and (version == "OS X 10.10.3"): FAIL + if (os == "mac"): FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-004.htm.ini index 0c5661bef27..0398928458f 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-004.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-004.htm.ini @@ -1,5 +1,4 @@ [color-applies-to-004.htm] type: reftest expected: - if (os == "mac") and (version == "OS X 10.8.5"): FAIL - if (os == "mac") and (version == "OS X 10.10.3"): FAIL + if (os == "mac"): FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-005.htm.ini index 6f46650ed11..54b95f28a88 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-005.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-005.htm.ini @@ -1,5 +1,4 @@ [color-applies-to-005.htm] type: reftest expected: - if (os == "mac") and (version == "OS X 10.8.5"): FAIL - if (os == "mac") and (version == "OS X 10.10.3"): FAIL + if (os == "mac"): FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-006.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-006.htm.ini index e6b4863e833..662545c687b 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-006.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-006.htm.ini @@ -1,5 +1,4 @@ [color-applies-to-006.htm] type: reftest expected: - if (os == "mac") and (version == "OS X 10.8.5"): FAIL - if (os == "mac") and (version == "OS X 10.10.3"): FAIL + if (os == "mac"): FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-013.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-013.htm.ini index 02cd3c89633..6bdca5570df 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-013.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-013.htm.ini @@ -1,5 +1,4 @@ [color-applies-to-013.htm] type: reftest expected: - if (os == "mac") and (version == "OS X 10.8.5"): FAIL - if (os == "mac") and (version == "OS X 10.10.3"): FAIL + if (os == "mac"): FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-015.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-015.htm.ini index b714bd5970c..d8f2b123aa4 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-015.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/color-applies-to-015.htm.ini @@ -1,5 +1,4 @@ [color-applies-to-015.htm] type: reftest expected: - if (os == "mac") and (version == "OS X 10.8.5"): FAIL - if (os == "mac") and (version == "OS X 10.10.3"): FAIL + if (os == "mac"): FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/content-177.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/content-177.htm.ini index 9a59e20f3e1..d12254cd75b 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/content-177.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/content-177.htm.ini @@ -1,6 +1,5 @@ [content-177.htm] type: reftest expected: - if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS - if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS + if (os == "mac"): PASS FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/display-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/display-008.htm.ini index b4d85ed114f..85b6be4b7bd 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/display-008.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/display-008.htm.ini @@ -1,5 +1,4 @@ [display-008.htm] type: reftest expected: - if (os == "mac") and (version == "OS X 10.8.5"): FAIL - if (os == "mac") and (version == "OS X 10.10.3"): FAIL + if (os == "mac"): FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/display-009.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/display-009.htm.ini index 94195c57f4b..d5367595bfd 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/display-009.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/display-009.htm.ini @@ -1,5 +1,4 @@ [display-009.htm] type: reftest expected: - if (os == "mac") and (version == "OS X 10.8.5"): FAIL - if (os == "mac") and (version == "OS X 10.10.3"): FAIL + if (os == "mac"): FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-008.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-008.htm.ini index f0c85310fbe..6bfc3a2f34f 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-008.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/float-applies-to-008.htm.ini @@ -1,5 +1,4 @@ [float-applies-to-008.htm] type: reftest expected: - if (os == "mac") and (version == "OS X 10.8.5"): FAIL - if (os == "mac") and (version == "OS X 10.10.3"): FAIL + if (os == "mac"): FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-001.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-001.htm.ini index bdd6d07ad72..9e64e8f7e3c 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-001.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-001.htm.ini @@ -1,6 +1,5 @@ [font-size-001.htm] type: reftest expected: - if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS - if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS + if (os == "mac"): PASS FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-002.htm.ini index 8171afcb223..5731311dbe0 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-002.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-002.htm.ini @@ -1,6 +1,5 @@ [font-size-002.htm] type: reftest expected: - if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS - if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS + if (os == "mac"): PASS FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-004.htm.ini index ac81bc9ab2c..94d29b0f40a 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-004.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-004.htm.ini @@ -1,6 +1,5 @@ [font-size-004.htm] type: reftest expected: - if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS - if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS + if (os == "mac"): PASS FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-005.htm.ini index c83b8734ddc..5340c65b0a9 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-005.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-005.htm.ini @@ -1,6 +1,5 @@ [font-size-005.htm] type: reftest expected: - if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS - if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS + if (os == "mac"): PASS FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-089.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-089.htm.ini index 711f72ccb04..d9bfede5725 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-089.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-089.htm.ini @@ -1,6 +1,5 @@ [font-size-089.htm] type: reftest expected: - if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS - if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS + if (os == "mac"): PASS FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-090.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-090.htm.ini index 6111233ae38..741d5d9ba11 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-090.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-090.htm.ini @@ -1,6 +1,5 @@ [font-size-090.htm] type: reftest expected: - if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS - if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS + if (os == "mac"): PASS FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-092.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-092.htm.ini index 37703eee6e2..5ea584fad66 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-092.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-092.htm.ini @@ -1,6 +1,5 @@ [font-size-092.htm] type: reftest expected: - if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS - if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS + if (os == "mac"): PASS FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-093.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-093.htm.ini index 7efd92200c8..386cbbc9860 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-093.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-093.htm.ini @@ -1,6 +1,5 @@ [font-size-093.htm] type: reftest expected: - if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS - if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS + if (os == "mac"): PASS FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-100.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-100.htm.ini index 7a681eac175..db17fbfe083 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-100.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-100.htm.ini @@ -1,6 +1,5 @@ [font-size-100.htm] type: reftest expected: - if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS - if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS + if (os == "mac"): PASS FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-101.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-101.htm.ini index ce8e724dee1..fa36de044ee 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-101.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-101.htm.ini @@ -1,6 +1,5 @@ [font-size-101.htm] type: reftest expected: - if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS - if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS + if (os == "mac"): PASS FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/font-size-102.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/font-size-102.htm.ini index 0560a6173ac..b832dd2c35e 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/font-size-102.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/font-size-102.htm.ini @@ -1,6 +1,5 @@ [font-size-102.htm] type: reftest expected: - if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS - if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS + if (os == "mac"): PASS FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini index 851b6361a1b..4b008a8af9b 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/inline-block-zorder-003.htm.ini @@ -1,5 +1,4 @@ [inline-block-zorder-003.htm] type: reftest expected: - if (os == "mac") and (version == "OS X 10.8.5"): FAIL - if (os == "mac") and (version == "OS X 10.10.3"): FAIL + if (os == "mac"): FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-004.htm.ini index 474689943ea..42db7e86e86 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-004.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-004.htm.ini @@ -1,5 +1,4 @@ [inline-formatting-context-004.htm] type: reftest expected: - if (os == "mac") and (version == "OS X 10.8.5"): FAIL - if (os == "mac") and (version == "OS X 10.10.3"): FAIL + if (os == "mac"): FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-005.htm.ini index e416e673989..11735f272d8 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-005.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-005.htm.ini @@ -1,5 +1,4 @@ [inline-formatting-context-005.htm] type: reftest expected: - if (os == "mac") and (version == "OS X 10.8.5"): FAIL - if (os == "mac") and (version == "OS X 10.10.3"): FAIL + if (os == "mac"): FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-023.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-023.htm.ini index c99b04cc536..8f3fd2946a6 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-023.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/inline-formatting-context-023.htm.ini @@ -1,4 +1,3 @@ [inline-formatting-context-023.htm] type: reftest - expected: - FAIL + expected: FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-121.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-121.htm.ini index 25e9af4d2c5..b849e528bdd 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/line-height-121.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/line-height-121.htm.ini @@ -1,6 +1,5 @@ [line-height-121.htm] type: reftest expected: - if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS - if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS + if (os == "mac"): PASS FAIL diff --git a/tests/wpt/metadata-css/css21_dev/html4/line-height-127.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/line-height-127.htm.ini index be863f60ab7..f3c5085851b 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/line-height-127.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/line-height-127.htm.ini @@ -1,6 +1,5 @@ [line-height-127.htm] type: reftest expected: - if not debug and (os == "mac") and (version == "OS X 10.8.5") and (processor == "x86_64") and (bits == 64): PASS - if not debug and (os == "mac") and (version == "OS X 10.10.3") and (processor == "x86_64") and (bits == 64): PASS + if (os == "mac"): PASS FAIL |