diff options
| author | Ms2ger <Ms2ger@gmail.com> | 2015-11-28 16:53:58 +0100 |
|---|---|---|
| committer | Ms2ger <Ms2ger@gmail.com> | 2015-11-29 10:57:14 +0100 |
| commit | 27e3ca61ec0a2039b08f0d22876046c183de1d80 (patch) | |
| tree | 84850ec1f536f806fe6cdbb53d43ec094ab77d7d | |
| parent | 7641d5b1e3db287909ce4ecc369592c9c4c7993e (diff) | |
| download | servo-27e3ca61ec0a2039b08f0d22876046c183de1d80.tar.gz servo-27e3ca61ec0a2039b08f0d22876046c183de1d80.zip | |
Move linebreak_simple_a.html to wpt reftests.
| -rw-r--r-- | tests/ref/basic.list | 1 | ||||
| -rw-r--r-- | tests/wpt/mozilla/meta/MANIFEST.json | 24 | ||||
| -rw-r--r-- | tests/wpt/mozilla/tests/css/linebreak_simple_a.html (renamed from tests/ref/linebreak_simple_a.html) | 1 | ||||
| -rw-r--r-- | tests/wpt/mozilla/tests/css/linebreak_simple_b.html (renamed from tests/ref/linebreak_simple_b.html) | 0 |
4 files changed, 25 insertions, 1 deletions
diff --git a/tests/ref/basic.list b/tests/ref/basic.list index c2f5e71ab9e..11b94c33a1f 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -13,7 +13,6 @@ fragment=top != ../html/acid2.html acid2_ref.html flaky_cpu == append_style_a.html append_style_b.html # `?` and `#` in the name is a test for https://github.com/servo/servo/issues/3340 -flaky_cpu == linebreak_simple_a.html linebreak_simple_b.html # Fails intermittently (#3636) # == link_style_dynamic_addition.html link_style_dynamic_addition_ref.html # Should be == with expected failure. See #2797 diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 8a152e381bb..0a8f3ff3391 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -2719,6 +2719,18 @@ "url": "/_mozilla/css/linebreak_inline_span_a.html" } ], + "css/linebreak_simple_a.html": [ + { + "path": "css/linebreak_simple_a.html", + "references": [ + [ + "/_mozilla/css/linebreak_simple_b.html", + "==" + ] + ], + "url": "/_mozilla/css/linebreak_simple_a.html" + } + ], "css/link_style_order.html": [ { "path": "css/link_style_order.html", @@ -8406,6 +8418,18 @@ "url": "/_mozilla/css/linebreak_inline_span_a.html" } ], + "css/linebreak_simple_a.html": [ + { + "path": "css/linebreak_simple_a.html", + "references": [ + [ + "/_mozilla/css/linebreak_simple_b.html", + "==" + ] + ], + "url": "/_mozilla/css/linebreak_simple_a.html" + } + ], "css/link_style_order.html": [ { "path": "css/link_style_order.html", diff --git a/tests/ref/linebreak_simple_a.html b/tests/wpt/mozilla/tests/css/linebreak_simple_a.html index 0a9ee7bbb30..c4951b4af9e 100644 --- a/tests/ref/linebreak_simple_a.html +++ b/tests/wpt/mozilla/tests/css/linebreak_simple_a.html @@ -1,3 +1,4 @@ +<link rel=match href=linebreak_simple_b.html> <body style="width: 300px;"> <p style="margin: 0px;">A <span>hahahahahhahahhahahhahahhahahhahahhahahhahahahhahah</span> <span>fruitloopsfruitloopsfruitloops</span> </body> diff --git a/tests/ref/linebreak_simple_b.html b/tests/wpt/mozilla/tests/css/linebreak_simple_b.html index a5eb48e225f..a5eb48e225f 100644 --- a/tests/ref/linebreak_simple_b.html +++ b/tests/wpt/mozilla/tests/css/linebreak_simple_b.html |