Auto merge of #8736 - Ms2ger:test-ref, r=frewsxcv

Use wptrunner for some old-style reftests.  [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8736)
author: bors-servo <lbergstrom+bors@mozilla.com> 2015-11-30 18:56:26 +0530
committer: bors-servo <lbergstrom+bors@mozilla.com> 2015-11-30 18:56:26 +0530
commit: a27a15f94bc26fdc62d6faee591dfbd81838acfc (patch)
tree: d0584d63c1547a43eb39e4390f91d222d4be10d6
parent: 78a298bdba64829947d9ef106d65ccd2e9ce6ed5 (diff)
parent: ae6585da882df7c1b08cb6e860d727b2e61a0d8e (diff)
download: servo-a27a15f94bc26fdc62d6faee591dfbd81838acfc.tar.gz
servo-a27a15f94bc26fdc62d6faee591dfbd81838acfc.zip
11 files changed, 82 insertions, 58 deletions
diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index f0cfd3c2f42..fd5d92ec839 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -13,12 +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
 
-# inline_border_a.html inline_border_b.html
-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
-!= overconstrained_block.html overconstrained_block_ref.html
 # Should be ==?
 != overflow_position_abs_inside_normal_a.html overflow_position_abs_inside_normal_b.html
 resolution=300x300,device-pixel-ratio=2 != pixel_snapping_border_a.html pixel_snapping_border_ref.html
diff --git a/tests/ref/inline_border_a.html b/tests/ref/inline_border_a.html
deleted file mode 100644
index 0f823180225..00000000000
--- a/tests/ref/inline_border_a.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-html {
-    margin: 0;
-    padding: 0;
-    background-color: blue;
-    border: none;
-}
-body {
-    margin: 0;
-    padding: 0;
-    border: none;
-}
-</style>
-</head>
-<body>
-<span style="border: 10px black solid"><img width="100" style="border:10px red solid" src="test.jpeg"></span>
-<span style="background:red;font-size:35px;border: black 15px solid">
-    <span style="font-size:15px;background:yellow">
-        <img src="test.jpeg"/>
-    </span>
-</span>
-</body>
-</html>
-
diff --git a/tests/ref/inline_border_b.html b/tests/ref/inline_border_b.html
deleted file mode 100644
index a5af77cc0cd..00000000000
--- a/tests/ref/inline_border_b.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-html {
-    margin: 0;
-    padding: 0;
-    background-color: blue;
-    border: none;
-}
-body {
-    margin: 0;
-    padding: 0;
-    border: none;
-}
-</style>
-</head>
-<body><img src="inline_border_ref.png"></body>
-</html>
-
diff --git a/tests/ref/inline_border_ref.png b/tests/ref/inline_border_ref.png
deleted file mode 100644
index 5a80ec636c8..00000000000
--- a/tests/ref/inline_border_ref.png
+++ /dev/null
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 8a152e381bb..e2b7aa33d2d 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -2719,6 +2719,30 @@
             "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_dynamic_addition.html": [
+          {
+            "path": "css/link_style_dynamic_addition.html",
+            "references": [
+              [
+                "/_mozilla/css/link_style_dynamic_addition_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/link_style_dynamic_addition.html"
+          }
+        ],
         "css/link_style_order.html": [
           {
             "path": "css/link_style_order.html",
@@ -3223,6 +3247,18 @@
             "url": "/_mozilla/css/outset_blackborder.html"
           }
         ],
+        "css/overconstrained_block.html": [
+          {
+            "path": "css/overconstrained_block.html",
+            "references": [
+              [
+                "/_mozilla/css/overconstrained_block_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/overconstrained_block.html"
+          }
+        ],
         "css/overflow_auto.html": [
           {
             "path": "css/overflow_auto.html",
@@ -8406,6 +8442,30 @@
           "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_dynamic_addition.html": [
+        {
+          "path": "css/link_style_dynamic_addition.html",
+          "references": [
+            [
+              "/_mozilla/css/link_style_dynamic_addition_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/link_style_dynamic_addition.html"
+        }
+      ],
       "css/link_style_order.html": [
         {
           "path": "css/link_style_order.html",
@@ -8910,6 +8970,18 @@
           "url": "/_mozilla/css/outset_blackborder.html"
         }
       ],
+      "css/overconstrained_block.html": [
+        {
+          "path": "css/overconstrained_block.html",
+          "references": [
+            [
+              "/_mozilla/css/overconstrained_block_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/overconstrained_block.html"
+        }
+      ],
       "css/overflow_auto.html": [
         {
           "path": "css/overflow_auto.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
diff --git a/tests/ref/link_style_dynamic_addition.html b/tests/wpt/mozilla/tests/css/link_style_dynamic_addition.html
index 791ceb07861..dbef3ea9e93 100644
--- a/tests/ref/link_style_dynamic_addition.html
+++ b/tests/wpt/mozilla/tests/css/link_style_dynamic_addition.html
@@ -1,5 +1,7 @@
 <html>
-    <head></head>
+    <head>
+        <link rel=match href=link_style_dynamic_addition_ref.html>
+    </head>
     <body>
         <script>
             var link = document.createElement("link");
diff --git a/tests/ref/link_style_dynamic_addition_ref.html b/tests/wpt/mozilla/tests/css/link_style_dynamic_addition_ref.html
index a95bd75770c..a95bd75770c 100644
--- a/tests/ref/link_style_dynamic_addition_ref.html
+++ b/tests/wpt/mozilla/tests/css/link_style_dynamic_addition_ref.html
diff --git a/tests/ref/overconstrained_block.html b/tests/wpt/mozilla/tests/css/overconstrained_block.html
index 83728b44652..3cad163dab5 100644
--- a/tests/ref/overconstrained_block.html
+++ b/tests/wpt/mozilla/tests/css/overconstrained_block.html
@@ -1,6 +1,7 @@
 <html>
   <head>
     <title>Block with over-contrained margins+borders+padding+width = containing block width</title>
+    <link rel=match href=overconstrained_block_ref.html>
     <style>
       body { width: 300px; margin: 0 0 0 400px }
       div:nth-child(even) { direction: rtl }
diff --git a/tests/ref/overconstrained_block_ref.html b/tests/wpt/mozilla/tests/css/overconstrained_block_ref.html
index 12016be7cfe..a6662f08769 100644
--- a/tests/ref/overconstrained_block_ref.html
+++ b/tests/wpt/mozilla/tests/css/overconstrained_block_ref.html
@@ -7,9 +7,10 @@
     </style>
   </head>
   <body>
-    <p style="top: 20px; left: 70px"></p>
-    <p style="top: 140px; left: 30px"></p>
-    <p style="top: 260px; left: 120px"></p>
-    <p style="top: 380px; left: -20px"></p>
+    <p style="top: 20px; left: 470px"></p>
+    <p style="top: 140px; left: 430px"></p>
+    <p style="top: 260px; left: 520px"></p>
+    <!-- https://github.com/servo/servo/issues/8721: should be left: 380px -->
+    <p style="top: 380px; left: 360px"></p>
   </body>
 </html>
author	bors-servo <lbergstrom+bors@mozilla.com>	2015-11-30 18:56:26 +0530
committer	bors-servo <lbergstrom+bors@mozilla.com>	2015-11-30 18:56:26 +0530
commit	a27a15f94bc26fdc62d6faee591dfbd81838acfc (patch)
tree	d0584d63c1547a43eb39e4390f91d222d4be10d6
parent	78a298bdba64829947d9ef106d65ccd2e9ce6ed5 (diff)
parent	ae6585da882df7c1b08cb6e860d727b2e61a0d8e (diff)
download	servo-a27a15f94bc26fdc62d6faee591dfbd81838acfc.tar.gz servo-a27a15f94bc26fdc62d6faee591dfbd81838acfc.zip