Add missing match/mismatch links to reftests submitted to CSS WG test suite, so that they work correctly as CSSWG reftests in addition to working as our reftests. No bug.

--HG-- extra : transplant_source : %19Rr%005%CB%C3%D9%D7%A0j%07%F9%F2R%18%B3%E2%18%26
2015-08-07 12:18:57 -07:00 · 2015-08-07 12:18:57 -07:00 · 84afd21e5c
--- a/layout/reftests/w3c-css/submitted/check-for-references.sh
+++ b/layout/reftests/w3c-css/submitted/check-for-references.sh
@ -0,0 +1,27 @@
+#!/bin/bash
+
+cd "$(dirname "$0")"
+find . -name reftest.list | sed 's,/reftest.list$,,' | while read DIRNAME
+do
+    cat "$DIRNAME/reftest.list" | grep -v "^\(include\|default-preferences\)" | sed 's/ #.*//;s/^#.*//;s/.* == /== /;s/.* != /!= /' | grep -v "^ *$" | while read TYPE TEST REF
+    do
+        REFTYPE=""
+        if [ "$TYPE" == "==" ]
+        then
+            REFTYPE="match"
+        elif [ "$TYPE" == "!=" ]
+        then
+            REFTYPE="mismatch"
+        else
+            echo "Unexpected type $TYPE for $DIRNAME/$TEST"
+        fi
+        if grep "rel=\"$REFTYPE\"" "$DIRNAME/$TEST" | head -1 | grep -q "href=\"$REF\""
+        then
+            #echo "Good link for $DIRNAME/$TEST"
+            echo -n
+        else
+            echo "Missing link for $DIRNAME/$TEST"
+            #echo "<link rel=\"$REFTYPE\" href=\"$REF\">" >> "$DIRNAME/$TEST"
+        fi
+    done
+done
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-1.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-10.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-10.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-11.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-11.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-12.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-12.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-13.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-13.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-8-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-14.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-14.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-14-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-15.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-15.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-15-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-2.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-2.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-3.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-3.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-4.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-4.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-5.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-5.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-6.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-6.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-7.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-7.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-8.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-8.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-8-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-9.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-block-page-break-inside-avoid-9.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-1.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-table-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-2.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-2.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-float-page-break-inside-avoid-2-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-3.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-3.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-4.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-4.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-block-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-5.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-5.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-float-page-break-inside-avoid-5-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-6.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-6.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-float-page-break-inside-avoid-6-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-7.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-7.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-float-page-break-inside-avoid-7-ref.html">
  <meta name="flags" content="paged"><style type="text/css">
@page { size:5in 3in; margin:0.5in; }
 html,body {
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-8.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-8.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-float-page-break-inside-avoid-8-ref.html">
  <meta name="flags" content="paged"><style type="text/css">
@page { size:5in 3in; margin:0.5in; }
 html,body {
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-9.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-float-page-break-inside-avoid-9.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-float-page-break-inside-avoid-9-ref.html">
  <meta name="flags" content="paged"><style type="text/css">
@page { size:5in 3in; margin:0.5in; }
 html,body {
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-inline-page-break-inside-avoid-1.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-inline-page-break-inside-avoid-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-inline-page-break-inside-avoid-1-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-row-page-break-inside-avoid-1.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-row-page-break-inside-avoid-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-rowgroup-page-break-inside-avoid-5-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-row-page-break-inside-avoid-2.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-row-page-break-inside-avoid-2.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-rowgroup-page-break-inside-avoid-5-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-1.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-table-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-2.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-2.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-table-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-3.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-3.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-table-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-4.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-4.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-rowgroup-page-break-inside-avoid-4-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-5.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-5.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-rowgroup-page-break-inside-avoid-5-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-6.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-6.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-rowgroup-page-break-inside-avoid-5-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-7.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-7.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-rowgroup-page-break-inside-avoid-7-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-8.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-8.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-rowgroup-page-break-inside-avoid-8-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-1.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-table-page-break-inside-avoid-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-2.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-2.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-table-page-break-inside-avoid-2-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-3.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-3.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-table-page-break-inside-avoid-3-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-4.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-4.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-table-page-break-inside-avoid-4-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-5.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-5.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-table-page-break-inside-avoid-5-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-6.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-6.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-table-page-break-inside-avoid-6-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-7.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-7.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-table-page-break-inside-avoid-7-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-8.html
+++ b/layout/reftests/w3c-css/submitted/css21/pagination/moz-css21-table-page-break-inside-avoid-8.html
@ -4,6 +4,7 @@
  <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-css21-table-page-break-inside-avoid-6-ref.html">
  <meta name="flags" content="paged">
 <style type="text/css">
@page { size:5in 3in; margin:0.5in; }
--- a/layout/reftests/w3c-css/submitted/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1.html
+++ b/layout/reftests/w3c-css/submitted/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1.html
@ -3,6 +3,7 @@
  <title>CSS Test: Balancing Overflow, page-break-inside:avoid</title>
  <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
  <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
+  <link rel="match" href="moz-multicol3-column-balancing-break-inside-avoid-1-ref.html">
  <meta name="flags" content="paged">
  <meta charset="utf-8">
  <style type="text/css">
--- a/layout/reftests/w3c-css/submitted/test-template-001.xht
+++ b/layout/reftests/w3c-css/submitted/test-template-001.xht
@ -7,7 +7,7 @@
  <meta name="flags" content="{{ see http://wiki.csswg.org/test/format#requirement-flags }}" />
  <meta name="assert" content="{{ explain precisely what is asserted when the test passes;
                                  optional but helps coordination and review }}" />
-  <link rel="match" href="test-template-001-ref.xht" />
+  <link rel="match" href="references/test-template-001.xht" />
  <style type="text/css"><![CDATA[
   {{ css for the test }}
  ]]></style>
--- a/layout/reftests/w3c-css/submitted/ui3/box-sizing-border-box-001.xht
+++ b/layout/reftests/w3c-css/submitted/ui3/box-sizing-border-box-001.xht
@ -4,6 +4,7 @@
  <title>CSS Test: Box Sizing - Border-Box with specified width</title>
  <link rel="author" title="Scott Johnson" href="mailto:sjohnson@mozilla.com" />
  <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+  <link rel="match" href="box-sizing-border-box-001-ref.xht" />
  <meta name="assert" content="box-sizing: border-box should make the element's (percentage) width be the distance from the left border edge to the right border edge." />
  <style type="text/css"><![CDATA[
    .container {
--- a/layout/reftests/w3c-css/submitted/ui3/box-sizing-border-box-002.xht
+++ b/layout/reftests/w3c-css/submitted/ui3/box-sizing-border-box-002.xht
@ -4,6 +4,7 @@
  <title>CSS Test: Box Sizing - Border-Box with specified width</title>
  <link rel="author" title="Scott Johnson" href="mailto:sjohnson@mozilla.com" />
  <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+  <link rel="match" href="box-sizing-border-box-002-ref.xht" />
  <meta name="assert" content="box-sizing: border-box should make the element's (percentage) width be the distance from the left border edge to the right border edge." />
  <style type="text/css"><![CDATA[
    .container {
--- a/layout/reftests/w3c-css/submitted/ui3/box-sizing-border-box-003.xht
+++ b/layout/reftests/w3c-css/submitted/ui3/box-sizing-border-box-003.xht
@ -4,6 +4,7 @@
  <title>CSS Test: Box Sizing - Border-Box with specified width/height</title>
  <link rel="author" title="Scott Johnson" href="mailto:sjohnson@mozilla.com" />
  <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+  <link rel="match" href="box-sizing-border-box-003-ref.xht" />
  <meta name="assert" content="box-sizing: border-box should make the element's (percentage) width be the distance from the left border edge to the right border edge and the height be the distance from the top border edge to the bottom border edge." />
  <style type="text/css"><![CDATA[
    .container {
--- a/layout/reftests/w3c-css/submitted/ui3/box-sizing-border-box-004.xht
+++ b/layout/reftests/w3c-css/submitted/ui3/box-sizing-border-box-004.xht
@ -4,6 +4,7 @@
  <title>CSS Test: Box Sizing - Border-Box with min/max width/height</title>
  <link rel="author" title="Scott Johnson" href="mailto:sjohnson@mozilla.com" />
  <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+  <link rel="match" href="box-sizing-border-box-004-ref.xht" />
  <meta name="assert" content="box-sizing: border-box should make the element's (length) width be the distance from the left border edge to the right border edge and the height be the distance from the top border edge to the bottom border edge." />
  <style type="text/css"><![CDATA[
    .container {
--- a/layout/reftests/w3c-css/submitted/ui3/box-sizing-content-box-001.xht
+++ b/layout/reftests/w3c-css/submitted/ui3/box-sizing-content-box-001.xht
@ -4,6 +4,7 @@
  <title>CSS Test: Box Sizing - Content-Box with specified width/height</title>
  <link rel="author" title="Scott Johnson" href="mailto:sjohnson@mozilla.com" />
  <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+  <link rel="match" href="box-sizing-content-box-001-ref.xht" />
  <meta name="assert" content="box-sizing: content-box should make the element's (percentage) width be the distance from the left content edge to the right content edge and the height be the distance from the top content edge to the bottom content edge."/>
  <style type="text/css"><![CDATA[
    .container {
--- a/layout/reftests/w3c-css/submitted/ui3/box-sizing-content-box-002.xht
+++ b/layout/reftests/w3c-css/submitted/ui3/box-sizing-content-box-002.xht
@ -4,6 +4,7 @@
  <title>CSS Test: Box Sizing - Content-Box with specified width/height</title>
  <link rel="author" title="Scott Johnson" href="mailto:sjohnson@mozilla.com" />
  <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+  <link rel="match" href="box-sizing-content-box-002-ref.xht" />
  <meta name="assert" content="box-sizing: content-box should make the element's (calc) width be the distance from the left content edge to the right content edge and the height be the distance from the top content edge to the bottom content edge."/>
  <style type="text/css"><![CDATA[
    .container {
--- a/layout/reftests/w3c-css/submitted/ui3/box-sizing-content-box-003.xht
+++ b/layout/reftests/w3c-css/submitted/ui3/box-sizing-content-box-003.xht
@ -4,6 +4,7 @@
  <title>CSS Test: Box Sizing - Content-Box with min/max width/height</title>
  <link rel="author" title="Scott Johnson" href="mailto:sjohnson@mozilla.com" />
  <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+  <link rel="match" href="box-sizing-content-box-003-ref.xht" />
  <meta name="assert" content="box-sizing: content-box should make the element's (percentage) width be the distance from the left content edge to the right content edge and the height be the distance from the top content edge to the bottom content edge."/>
  <style type="text/css"><![CDATA[
    .container {
--- a/layout/reftests/w3c-css/submitted/ui3/box-sizing-replaced-001.xht
+++ b/layout/reftests/w3c-css/submitted/ui3/box-sizing-replaced-001.xht
@ -5,6 +5,7 @@
    <link href="http://fantasai.inkedblade.net/contact" title="Elika J. Etemad" rel="author"></link>
    <link href="mailto:sjohnson@mozilla.com" title="Scott Johnson" rel="author"></link>
    <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+    <link rel="match" href="box-sizing-replaced-001-ref.xht" />
    <meta content="image" name="flags"></meta>
    <meta name="assert" content="All images should be sized at 75px x 75px, with 5px of padding around each." />
    <!--
--- a/layout/reftests/w3c-css/submitted/ui3/box-sizing-replaced-002.xht
+++ b/layout/reftests/w3c-css/submitted/ui3/box-sizing-replaced-002.xht
@ -5,6 +5,7 @@
    <link href="http://fantasai.inkedblade.net/contact" title="Elika J. Etemad" rel="author"></link>
    <link href="mailto:sjohnson@mozilla.com" title="Scott Johnson" rel="author"></link>
    <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+    <link rel="match" href="box-sizing-replaced-002-ref.xht" />
    <meta content="image" name="flags"></meta>
    <meta name="assert" content="All images should be sized at 75px x 75px, with 5px of padding and 5px of blue border around each." />
    <!--
--- a/layout/reftests/w3c-css/submitted/ui3/box-sizing-replaced-003.xht
+++ b/layout/reftests/w3c-css/submitted/ui3/box-sizing-replaced-003.xht
@ -5,6 +5,7 @@
    <link href="http://fantasai.inkedblade.net/contact" title="Elika J. Etemad" rel="author"></link>
    <link href="mailto:sjohnson@mozilla.com" title="Scott Johnson" rel="author"></link>
    <link rel="help" href="http://www.w3.org/TR/css3-ui/#box-sizing" />
+    <link rel="match" href="box-sizing-replaced-003-ref.xht" />
    <meta content="image" name="flags"></meta>
    <meta name="assert" content="All images should be sized at 75px x 75px." />
    <!--
--- a/layout/reftests/w3c-css/submitted/values3/calc-background-image-gradient-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-background-image-gradient-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for calc() on background-image gradients</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-background-image-gradient-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">

--- a/layout/reftests/w3c-css/submitted/values3/calc-background-linear-gradient-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-background-linear-gradient-1.html
@ -3,6 +3,7 @@
  <title>CSS Test: Support calc() on gradient stop positions</title>
  <link rel="author" title="Yu-Sian (Thomasy) Liu" href="https://bugzilla.mozilla.org/show_bug.cgi?id=594935">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-background-linear-gradient-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">
 div {
--- a/layout/reftests/w3c-css/submitted/values3/calc-background-position-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-background-position-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for calc() on background-position</title>
  <link rel="author" title="L. David Baron" href="https://bugzilla.mozilla.org/show_bug.cgi?id=594934">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-background-position-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">

--- a/layout/reftests/w3c-css/submitted/values3/calc-background-size-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-background-size-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for calc() on background-size</title>
  <link rel="author" title="L. David Baron" href="https://bugzilla.mozilla.org/show_bug.cgi?id=594934">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-background-size-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">

--- a/layout/reftests/w3c-css/submitted/values3/calc-border-radius-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-border-radius-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: test for border-radius: calc()</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-border-radius-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">

--- a/layout/reftests/w3c-css/submitted/values3/calc-height-block-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-height-block-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for height:calc() on blocks</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-height-block-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">
 body { margin: 0 }
--- a/layout/reftests/w3c-css/submitted/values3/calc-height-table-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-height-table-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test that height:calc() with no percentages has an effect on inner table elements</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-height-table-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">
 tbody, tr, td {
--- a/layout/reftests/w3c-css/submitted/values3/calc-margin-block-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-margin-block-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test of margin-*: calc()</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-margin-block-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">

--- a/layout/reftests/w3c-css/submitted/values3/calc-max-height-block-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-max-height-block-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for max-height:calc() on blocks</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-max-height-block-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">
 body { margin: 0 }
--- a/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: max-width: calc() on blocks</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-width-block-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">

--- a/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-intrinsic-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-max-width-block-intrinsic-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: intrinsic width of max-width: calc() on blocks</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-max-width-block-intrinsic-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">

--- a/layout/reftests/w3c-css/submitted/values3/calc-min-height-block-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-min-height-block-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for min-height:calc() on blocks</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-height-block-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">
 body { margin: 0 }
--- a/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: min-width: calc() on blocks</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-width-block-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">

--- a/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-intrinsic-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-min-width-block-intrinsic-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: intrinsic width of min-width: calc() on blocks</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-min-width-block-intrinsic-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">

--- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-bottom-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-bottom-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for bottom:calc() on absolutely positioned elements</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-offsets-absolute-top-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">
 body { margin: 0 }
--- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-left-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-left-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for left:calc() on absolutely positioned elements</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-offsets-relative-left-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">
 body { margin: 0 100px; width: 200px }
--- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-right-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-right-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for right:calc() on absolutely positioned elements</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-offsets-relative-left-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">
 body { margin: 0; width: 200px }
--- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-top-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-absolute-top-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for top:calc() on absolutely positioned elements</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-offsets-absolute-top-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">
 body { margin: 0 }
--- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-bottom-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-bottom-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for bottom:calc() on relatively positioned elements</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-offsets-relative-top-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">
 body { margin: 0 }
--- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-left-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-left-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for left:calc() on relatively positioned elements</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-offsets-relative-left-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">
 body { margin: 0 100px; width: 100px }
--- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-right-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-right-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for right:calc() on relatively positioned elements</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-offsets-relative-left-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">
 body { margin: 0 100px; width: 100px }
--- a/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-top-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-offsets-relative-top-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for top:calc() on relatively positioned elements</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-offsets-relative-top-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">
 body { margin: 0 }
--- a/layout/reftests/w3c-css/submitted/values3/calc-padding-block-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-padding-block-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test of padding-*: calc()</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-padding-block-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">

--- a/layout/reftests/w3c-css/submitted/values3/calc-text-indent-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-text-indent-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: text-indent: calc() on blocks</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-text-indent-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">

--- a/layout/reftests/w3c-css/submitted/values3/calc-text-indent-intrinsic-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-text-indent-intrinsic-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: intrinsic width of text-indent: calc() on blocks</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-text-indent-intrinsic-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">

--- a/layout/reftests/w3c-css/submitted/values3/calc-transform-origin-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-transform-origin-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for calc() on transform-origin</title>
  <link rel="author" title="L. David Baron" href="https://bugzilla.mozilla.org/show_bug.cgi?id=594934">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-transform-origin-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">

--- a/layout/reftests/w3c-css/submitted/values3/calc-vertical-align-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-vertical-align-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: Test for vertical-align:calc()</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-vertical-align-1-ref.html">
  <meta name="flags" content="">

 <div style="line-height: 100px; margin-top: 100px">
--- a/layout/reftests/w3c-css/submitted/values3/calc-width-block-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-width-block-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: width: calc() on blocks</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-width-block-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">

--- a/layout/reftests/w3c-css/submitted/values3/calc-width-block-intrinsic-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-width-block-intrinsic-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: intrinsic width of width: calc() on blocks</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-width-block-intrinsic-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">

--- a/layout/reftests/w3c-css/submitted/values3/calc-width-table-auto-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-width-table-auto-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: width: calc() on table-layout: auto tables</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-width-table-auto-1-ref.html">
  <meta name="flags" content="">
 <table border>
  <tr>
--- a/layout/reftests/w3c-css/submitted/values3/calc-width-table-fixed-1.html
+++ b/layout/reftests/w3c-css/submitted/values3/calc-width-table-fixed-1.html
@ -4,6 +4,7 @@
  <title>CSS Test: width: calc() on table-layout: auto tables</title>
  <link rel="author" title="L. David Baron" href="http://dbaron.org/">
  <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
+  <link rel="match" href="calc-width-table-fixed-1-ref.html">
  <meta name="flags" content="">
 <style type="text/css">
 table { table-layout: fixed; width: 500px; border-spacing: 0 }
--- a/layout/reftests/w3c-css/submitted/variables/variable-external-font-face-01.html
+++ b/layout/reftests/w3c-css/submitted/variables/variable-external-font-face-01.html
@ -6,7 +6,7 @@
 <title>CSS Test: Test the invalid declaration and use of a variable in an @font-face rule within an external CSS.</title>
 <link rel="author" title="Mihaela Velimiroviciu" href="mailto:mihaela.velimiroviciu@softvisioninc.eu">
 <link rel="help" href="http://www.w3.org/TR/css-variables-1/#defining-variables">
-<link rel="match" href="variable-font-face-01-ref.html">
+<link rel="match" href="variable-external-font-face-01-ref.html">
 <link rel="stylesheet" type="text/css" href="support/external-variable-font-face.css">
 <meta name="flags" content="ahem">
 <p id=a>This text must not be in Ahem.</p>
--- a/layout/reftests/w3c-css/submitted/variables/variable-reference-38.html
+++ b/layout/reftests/w3c-css/submitted/variables/variable-reference-38.html
@ -6,7 +6,7 @@
 <title>CSS Test: Test using variables in overlapping shorthands.</title>
 <link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
 <link rel="help" href="http://www.w3.org/TR/css-variables-1/#variables-in-shorthands">
-<link rel="match" href="variable-declaration-59-ref.html">
+<link rel="match" href="variable-reference-38-ref.html">
 <style>
 p { padding-left: 1em; }
 #a { --style: solid; --left: black dotted; border-style: var(--style); border-left: var(--left); border-top: none; border-right: none; border-bottom: none; }