From 9fc3b6b6ccb5d0dfef23b92ab058b52d8049c238 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Tue, 27 Oct 2015 13:15:29 +0100
Subject: [PATCH 1/6] Update the manifest.

---
 tests/wpt/mozilla/meta/MANIFEST.json | 48 ++++++++++++++--------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 63c0c8a7eef..b06558cb519 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -899,6 +899,18 @@
             "url": "/_mozilla/css/br.html"
           }
         ],
+        "css/button_css_width.html": [
+          {
+            "path": "css/button_css_width.html",
+            "references": [
+              [
+                "/_mozilla/css/button_css_width_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/button_css_width.html"
+          }
+        ],
         "css/calc-basic.html": [
           {
             "path": "css/calc-basic.html",
@@ -947,18 +959,6 @@
             "url": "/_mozilla/css/case-insensitive-font-family.html"
           }
         ],
-        "css/button_css_width.html": [
-          {
-            "path": "css/button_css_width.html",
-            "references": [
-              [
-                "/_mozilla/css/button_css_width_ref.html",
-                "=="
-              ]
-            ],
-            "url": "/_mozilla/css/button_css_width.html"
-          }
-        ],
         "css/class-namespaces.html": [
           {
             "path": "css/class-namespaces.html",
@@ -5436,6 +5436,18 @@
           "url": "/_mozilla/css/br.html"
         }
       ],
+      "css/button_css_width.html": [
+        {
+          "path": "css/button_css_width.html",
+          "references": [
+            [
+              "/_mozilla/css/button_css_width_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/button_css_width.html"
+        }
+      ],
       "css/calc-basic.html": [
         {
           "path": "css/calc-basic.html",
@@ -5484,18 +5496,6 @@
           "url": "/_mozilla/css/case-insensitive-font-family.html"
         }
       ],
-      "css/button_css_width.html": [
-        {
-          "path": "css/button_css_width.html",
-          "references": [
-            [
-              "/_mozilla/css/button_css_width_ref.html",
-              "=="
-            ]
-          ],
-          "url": "/_mozilla/css/button_css_width.html"
-        }
-      ],
       "css/class-namespaces.html": [
         {
           "path": "css/class-namespaces.html",

From b456b219f683d4451c91573d55a9b6f098319bf8 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Tue, 27 Oct 2015 13:16:34 +0100
Subject: [PATCH 2/6] Move border_spacing_auto_layout_a.html to wpt reftests.

---
 tests/ref/basic.list                          |  1 -
 tests/wpt/mozilla/meta/MANIFEST.json          | 24 +++++++++++++++++++
 .../css}/border_spacing_auto_layout_a.html    |  1 +
 3 files changed, 25 insertions(+), 1 deletion(-)
 rename tests/{ref => wpt/mozilla/tests/css}/border_spacing_auto_layout_a.html (92%)

diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 778aa7c475a..d4413e27e9d 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -11,7 +11,6 @@ fragment=top != ../html/acid2.html acid2_ref.html
 
 == acid2_noscroll.html acid2_ref_broken.html
 flaky_cpu == append_style_a.html append_style_b.html
-== border_spacing_auto_layout_a.html border_spacing_ref.html
 == border_spacing_fixed_layout_a.html border_spacing_ref.html
 == borders_a.html borders_b.html
 != box_shadow_blur_a.html box_shadow_blur_ref.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index b06558cb519..450c1e3c244 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -791,6 +791,18 @@
             "url": "/_mozilla/css/border_spacing_a.html"
           }
         ],
+        "css/border_spacing_auto_layout_a.html": [
+          {
+            "path": "css/border_spacing_auto_layout_a.html",
+            "references": [
+              [
+                "/_mozilla/css/border_spacing_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/border_spacing_auto_layout_a.html"
+          }
+        ],
         "css/border_spacing_empty_table.html": [
           {
             "path": "css/border_spacing_empty_table.html",
@@ -5328,6 +5340,18 @@
           "url": "/_mozilla/css/border_spacing_a.html"
         }
       ],
+      "css/border_spacing_auto_layout_a.html": [
+        {
+          "path": "css/border_spacing_auto_layout_a.html",
+          "references": [
+            [
+              "/_mozilla/css/border_spacing_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/border_spacing_auto_layout_a.html"
+        }
+      ],
       "css/border_spacing_empty_table.html": [
         {
           "path": "css/border_spacing_empty_table.html",
diff --git a/tests/ref/border_spacing_auto_layout_a.html b/tests/wpt/mozilla/tests/css/border_spacing_auto_layout_a.html
similarity index 92%
rename from tests/ref/border_spacing_auto_layout_a.html
rename to tests/wpt/mozilla/tests/css/border_spacing_auto_layout_a.html
index d8195e0c368..4a3922e2b70 100644
--- a/tests/ref/border_spacing_auto_layout_a.html
+++ b/tests/wpt/mozilla/tests/css/border_spacing_auto_layout_a.html
@@ -5,6 +5,7 @@
     Tests that `border-spacing` with automatic table layout works when not all the column sizes
     are specified.
 -->
+<link rel=match href=border_spacing_ref.html>
 <style>
 body, html {
     margin: 0;

From 8838133abe949cdc51fb1770c53c3f728e147375 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Tue, 27 Oct 2015 13:23:24 +0100
Subject: [PATCH 3/6] Move border_spacing_fixed_layout_a.html to wpt reftests.

---
 tests/ref/basic.list                          |  1 -
 tests/wpt/mozilla/meta/MANIFEST.json          | 24 +++++++++++++++++++
 .../css}/border_spacing_fixed_layout_a.html   |  1 +
 3 files changed, 25 insertions(+), 1 deletion(-)
 rename tests/{ref => wpt/mozilla/tests/css}/border_spacing_fixed_layout_a.html (92%)

diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index d4413e27e9d..5c99253b6bd 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -11,7 +11,6 @@ fragment=top != ../html/acid2.html acid2_ref.html
 
 == acid2_noscroll.html acid2_ref_broken.html
 flaky_cpu == append_style_a.html append_style_b.html
-== border_spacing_fixed_layout_a.html border_spacing_ref.html
 == borders_a.html borders_b.html
 != box_shadow_blur_a.html box_shadow_blur_ref.html
 == box_shadow_default_color_a.html box_shadow_default_color_ref.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 450c1e3c244..e8b204b4644 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -815,6 +815,18 @@
             "url": "/_mozilla/css/border_spacing_empty_table.html"
           }
         ],
+        "css/border_spacing_fixed_layout_a.html": [
+          {
+            "path": "css/border_spacing_fixed_layout_a.html",
+            "references": [
+              [
+                "/_mozilla/css/border_spacing_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/border_spacing_fixed_layout_a.html"
+          }
+        ],
         "css/border_style_none_a.html": [
           {
             "path": "css/border_style_none_a.html",
@@ -5364,6 +5376,18 @@
           "url": "/_mozilla/css/border_spacing_empty_table.html"
         }
       ],
+      "css/border_spacing_fixed_layout_a.html": [
+        {
+          "path": "css/border_spacing_fixed_layout_a.html",
+          "references": [
+            [
+              "/_mozilla/css/border_spacing_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/border_spacing_fixed_layout_a.html"
+        }
+      ],
       "css/border_style_none_a.html": [
         {
           "path": "css/border_style_none_a.html",
diff --git a/tests/ref/border_spacing_fixed_layout_a.html b/tests/wpt/mozilla/tests/css/border_spacing_fixed_layout_a.html
similarity index 92%
rename from tests/ref/border_spacing_fixed_layout_a.html
rename to tests/wpt/mozilla/tests/css/border_spacing_fixed_layout_a.html
index 0e6d8a1e630..f90fd485da4 100644
--- a/tests/ref/border_spacing_fixed_layout_a.html
+++ b/tests/wpt/mozilla/tests/css/border_spacing_fixed_layout_a.html
@@ -5,6 +5,7 @@
     Tests that `border-spacing` with automatic table layout works when not all the column sizes
     are specified.
 -->
+<link rel=match href=border_spacing_ref.html>
 <style>
 body, html {
     margin: 0;

From 5b08ac9ca9b08a42b6c3d19df5efe1f103bccca6 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Tue, 27 Oct 2015 13:32:29 +0100
Subject: [PATCH 4/6] Move borders_a.html to wpt reftests.

---
 tests/ref/basic.list                          |   1 -
 tests/wpt/mozilla/meta/MANIFEST.json          |  24 ++++++++++++++++++
 .../mozilla/tests/css}/borders.png            | Bin
 .../mozilla/tests/css}/borders_a.html         |   1 +
 .../mozilla/tests/css}/borders_b.html         |   0
 5 files changed, 25 insertions(+), 1 deletion(-)
 rename tests/{ref => wpt/mozilla/tests/css}/borders.png (100%)
 rename tests/{ref => wpt/mozilla/tests/css}/borders_a.html (97%)
 rename tests/{ref => wpt/mozilla/tests/css}/borders_b.html (100%)

diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 5c99253b6bd..c7313b896d8 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -11,7 +11,6 @@ fragment=top != ../html/acid2.html acid2_ref.html
 
 == acid2_noscroll.html acid2_ref_broken.html
 flaky_cpu == append_style_a.html append_style_b.html
-== borders_a.html borders_b.html
 != box_shadow_blur_a.html box_shadow_blur_ref.html
 == box_shadow_default_color_a.html box_shadow_default_color_ref.html
 == box_shadow_inset_a.html box_shadow_inset_ref.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index e8b204b4644..d4d25c83a34 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -839,6 +839,18 @@
             "url": "/_mozilla/css/border_style_none_a.html"
           }
         ],
+        "css/borders_a.html": [
+          {
+            "path": "css/borders_a.html",
+            "references": [
+              [
+                "/_mozilla/css/borders_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/borders_a.html"
+          }
+        ],
         "css/box_shadow_bg.html": [
           {
             "path": "css/box_shadow_bg.html",
@@ -5400,6 +5412,18 @@
           "url": "/_mozilla/css/border_style_none_a.html"
         }
       ],
+      "css/borders_a.html": [
+        {
+          "path": "css/borders_a.html",
+          "references": [
+            [
+              "/_mozilla/css/borders_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/borders_a.html"
+        }
+      ],
       "css/box_shadow_bg.html": [
         {
           "path": "css/box_shadow_bg.html",
diff --git a/tests/ref/borders.png b/tests/wpt/mozilla/tests/css/borders.png
similarity index 100%
rename from tests/ref/borders.png
rename to tests/wpt/mozilla/tests/css/borders.png
diff --git a/tests/ref/borders_a.html b/tests/wpt/mozilla/tests/css/borders_a.html
similarity index 97%
rename from tests/ref/borders_a.html
rename to tests/wpt/mozilla/tests/css/borders_a.html
index 0ec25b10740..cea6f3a94e4 100644
--- a/tests/ref/borders_a.html
+++ b/tests/wpt/mozilla/tests/css/borders_a.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 <html>
 <head>
+<link rel=match href=borders_b.html>
 <style>
 #none{
     border-style: none;
diff --git a/tests/ref/borders_b.html b/tests/wpt/mozilla/tests/css/borders_b.html
similarity index 100%
rename from tests/ref/borders_b.html
rename to tests/wpt/mozilla/tests/css/borders_b.html

From f9930ab1fe0daddee9ce278327d5e998f4e24d51 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Tue, 27 Oct 2015 14:00:13 +0100
Subject: [PATCH 5/6] Move box_shadow_blur_a.html to wpt reftests.

---
 tests/ref/basic.list                          |  1 -
 tests/wpt/mozilla/meta/MANIFEST.json          | 24 +++++++++++++++++++
 .../mozilla/tests/css}/box_shadow_blur_a.html |  1 +
 .../tests/css}/box_shadow_blur_ref.html       |  0
 4 files changed, 25 insertions(+), 1 deletion(-)
 rename tests/{ref => wpt/mozilla/tests/css}/box_shadow_blur_a.html (85%)
 rename tests/{ref => wpt/mozilla/tests/css}/box_shadow_blur_ref.html (100%)

diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index c7313b896d8..6c771cf54e7 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -11,7 +11,6 @@ fragment=top != ../html/acid2.html acid2_ref.html
 
 == acid2_noscroll.html acid2_ref_broken.html
 flaky_cpu == append_style_a.html append_style_b.html
-!= box_shadow_blur_a.html box_shadow_blur_ref.html
 == box_shadow_default_color_a.html box_shadow_default_color_ref.html
 == box_shadow_inset_a.html box_shadow_inset_ref.html
 == box_shadow_inset_parsing_a.html box_shadow_inset_parsing_ref.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index d4d25c83a34..becfa497d58 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -863,6 +863,18 @@
             "url": "/_mozilla/css/box_shadow_bg.html"
           }
         ],
+        "css/box_shadow_blur_a.html": [
+          {
+            "path": "css/box_shadow_blur_a.html",
+            "references": [
+              [
+                "/_mozilla/css/box_shadow_blur_ref.html",
+                "!="
+              ]
+            ],
+            "url": "/_mozilla/css/box_shadow_blur_a.html"
+          }
+        ],
         "css/box_shadow_border_box_a.html": [
           {
             "path": "css/box_shadow_border_box_a.html",
@@ -5436,6 +5448,18 @@
           "url": "/_mozilla/css/box_shadow_bg.html"
         }
       ],
+      "css/box_shadow_blur_a.html": [
+        {
+          "path": "css/box_shadow_blur_a.html",
+          "references": [
+            [
+              "/_mozilla/css/box_shadow_blur_ref.html",
+              "!="
+            ]
+          ],
+          "url": "/_mozilla/css/box_shadow_blur_a.html"
+        }
+      ],
       "css/box_shadow_border_box_a.html": [
         {
           "path": "css/box_shadow_border_box_a.html",
diff --git a/tests/ref/box_shadow_blur_a.html b/tests/wpt/mozilla/tests/css/box_shadow_blur_a.html
similarity index 85%
rename from tests/ref/box_shadow_blur_a.html
rename to tests/wpt/mozilla/tests/css/box_shadow_blur_a.html
index b49d2fa7837..04e148133c3 100644
--- a/tests/ref/box_shadow_blur_a.html
+++ b/tests/wpt/mozilla/tests/css/box_shadow_blur_a.html
@@ -1,5 +1,6 @@
 <head>
 <!-- Tests that box-shadow blur does something. -->
+<link rel=mismatch href=box_shadow_blur_ref.html>
 <style>
 section {
     position: absolute;
diff --git a/tests/ref/box_shadow_blur_ref.html b/tests/wpt/mozilla/tests/css/box_shadow_blur_ref.html
similarity index 100%
rename from tests/ref/box_shadow_blur_ref.html
rename to tests/wpt/mozilla/tests/css/box_shadow_blur_ref.html

From c265c52939ee6e14630d70c3969c64688e0dcc6f Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Tue, 27 Oct 2015 14:07:01 +0100
Subject: [PATCH 6/6] Move box_shadow_default_color_a.html to wpt reftests.

---
 tests/ref/basic.list                          |  1 -
 tests/wpt/mozilla/meta/MANIFEST.json          | 24 +++++++++++++++++++
 .../css}/box_shadow_default_color_a.html      |  1 +
 .../css}/box_shadow_default_color_ref.html    |  0
 4 files changed, 25 insertions(+), 1 deletion(-)
 rename tests/{ref => wpt/mozilla/tests/css}/box_shadow_default_color_a.html (84%)
 rename tests/{ref => wpt/mozilla/tests/css}/box_shadow_default_color_ref.html (100%)

diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 6c771cf54e7..dd24a6924f1 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -11,7 +11,6 @@ fragment=top != ../html/acid2.html acid2_ref.html
 
 == acid2_noscroll.html acid2_ref_broken.html
 flaky_cpu == append_style_a.html append_style_b.html
-== box_shadow_default_color_a.html box_shadow_default_color_ref.html
 == box_shadow_inset_a.html box_shadow_inset_ref.html
 == box_shadow_inset_parsing_a.html box_shadow_inset_parsing_ref.html
 == box_shadow_spread_a.html box_shadow_spread_ref.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index becfa497d58..c586b97dae7 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -887,6 +887,18 @@
             "url": "/_mozilla/css/box_shadow_border_box_a.html"
           }
         ],
+        "css/box_shadow_default_color_a.html": [
+          {
+            "path": "css/box_shadow_default_color_a.html",
+            "references": [
+              [
+                "/_mozilla/css/box_shadow_default_color_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/box_shadow_default_color_a.html"
+          }
+        ],
         "css/box_shadow_inset_bg.html": [
           {
             "path": "css/box_shadow_inset_bg.html",
@@ -5472,6 +5484,18 @@
           "url": "/_mozilla/css/box_shadow_border_box_a.html"
         }
       ],
+      "css/box_shadow_default_color_a.html": [
+        {
+          "path": "css/box_shadow_default_color_a.html",
+          "references": [
+            [
+              "/_mozilla/css/box_shadow_default_color_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/box_shadow_default_color_a.html"
+        }
+      ],
       "css/box_shadow_inset_bg.html": [
         {
           "path": "css/box_shadow_inset_bg.html",
diff --git a/tests/ref/box_shadow_default_color_a.html b/tests/wpt/mozilla/tests/css/box_shadow_default_color_a.html
similarity index 84%
rename from tests/ref/box_shadow_default_color_a.html
rename to tests/wpt/mozilla/tests/css/box_shadow_default_color_a.html
index fe36f41752d..2715959f1b5 100644
--- a/tests/ref/box_shadow_default_color_a.html
+++ b/tests/wpt/mozilla/tests/css/box_shadow_default_color_a.html
@@ -1,5 +1,6 @@
 <head>
 <!-- Tests that the box-shadow color is correct if unspecified. -->
+<link rel=match href=box_shadow_default_color_ref.html>
 <style>
 section {
     position: absolute;
diff --git a/tests/ref/box_shadow_default_color_ref.html b/tests/wpt/mozilla/tests/css/box_shadow_default_color_ref.html
similarity index 100%
rename from tests/ref/box_shadow_default_color_ref.html
rename to tests/wpt/mozilla/tests/css/box_shadow_default_color_ref.html