Skip to content

Commit

Permalink
Auto merge of #13599 - slester:master, r=jdm
Browse files Browse the repository at this point in the history
Run CSS Multicolumn tests automatically

<!-- Please describe your changes on the following line: -->
Implements the CSS multicolumn tests as outlined in issue #13587.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #13587

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because they implement tests for other features.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13599)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Oct 5, 2016
2 parents 896be06 + ec8ade4 commit 6bd8986
Show file tree
Hide file tree
Showing 156 changed files with 475 additions and 0 deletions.
7 changes: 7 additions & 0 deletions tests/wpt/include_css.ini
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ skip: true
[xhtml1print]
skip: true

[css-multicol-1_dev]
skip: false
[xhtml1]
skip: true
[xhtml1print]
skip: true

[css-style-attr-1_dev]
skip: false
[xhtml1]
Expand Down
4 changes: 4 additions & 0 deletions tests/wpt/metadata-css/css-multicol-1_dev/__dir__.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
prefs: ["layout.column-count.enabled:true",
"layout.column-gap.enabled:true",
"layout.column-width.enabled:true",
"layout.columns.enabled:true"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-basic-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-basic-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-basic-003.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-basic-004.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-block-clip-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-block-clip-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[multicol-br-inside-avoidcolumn-001.htm]
type: reftest
expected:
if os == "linux": TIMEOUT
CRASH
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-break-000.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-break-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-clip-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-clip-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-collapsing-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-columns-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-columns-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-columns-003.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-columns-004.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-columns-005.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-columns-006.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-columns-007.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-columns-invalid-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-columns-invalid-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-columns-toolong-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-containing-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-containing-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-count-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-count-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-count-computed-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-count-computed-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-count-computed-003.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-count-computed-005.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-count-large-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-count-large-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-count-negative-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-count-negative-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-count-non-integer-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-count-non-integer-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-count-non-integer-003.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-fill-000.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-fill-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-fill-auto-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-fill-auto-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-fill-auto-003.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-fill-auto-block-children-001.htm]
type: reftest
expected: TIMEOUT
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-fill-auto-block-children-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-fill-auto.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-fill-balance-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-gap-000.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-gap-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-gap-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-gap-003.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-gap-fraction-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-gap-large-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-gap-large-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-gap-negative-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-height-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-height-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-height-block-child-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-inherit-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-inherit-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-inherit-003.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-inherit-004.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-list-item-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-margin-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-margin-child-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-nested-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-nested-005.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-nested-column-rule-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-nested-margin-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-nested-margin-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-nested-margin-003.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-nested-margin-004.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-nested-margin-005.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-overflow-000.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-overflowing-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-reduce-000.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-000.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-003.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-004.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-color-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-color-inherit-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-color-inherit-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-dashed-000.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-dotted-000.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-double-000.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-fraction-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-fraction-002.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-fraction-003.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-groove-000.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-hidden-000.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-inset-000.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-large-001.htm]
type: reftest
expected: FAIL
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[multicol-rule-none-000.htm]
type: reftest
expected: FAIL
Loading

0 comments on commit 6bd8986

Please sign in to comment.