auto merge of #1859 : kmcallister/servo/move, r=jdm

And update `CONTRIBUTING.md`.

60 files changed, 4 insertions, 3 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5b74d442542..d9e632fa338 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,8 +26,9 @@ follow this format, even those from core contributors.
   it, you can @-reply a reviewer asking for a review in the pull request or a
   comment, or you can ask for a review in `#servo` on `irc.mozilla.org`.
 
-- When changing code related to the DOM, add a test to `src/test/html/content`,
-  either by adding it to an existing test file or creating a new one.
+- Add tests relevant to the fixed bug or new feature.  For a DOM change this
+  will usually be a content test; for layout, a reftest.  See our [testing
+  guide](https://github.com/mozilla/servo/wiki/Testing) for more information.
 
 For specific git instructions, see [GitHub & Critic PR handling 101](https://github.com/mozilla/servo/wiki/Github-&-Critic-PR-handling-101).
 
diff --git a/mk/check.mk b/mk/check.mk
index 384d4c5ab22..e8c4796fa85 100644
--- a/mk/check.mk
+++ b/mk/check.mk
@@ -89,7 +89,7 @@ check-ref: reftest
 .PHONY: check-content
 check-content: contenttest
 	@$(call E, check: contenttests)
-	$(Q)./contenttest --source-dir=$(S)src/test/html/content $(TESTNAME)
+	$(Q)./contenttest --source-dir=$(S)src/test/content $(TESTNAME)
 
 .PHONY: tidy
 tidy:
diff --git a/src/test/html/content/harness.js b/src/test/content/harness.js
index 72aa2712469..72aa2712469 100644
--- a/src/test/html/content/harness.js
+++ b/src/test/content/harness.js
diff --git a/src/test/html/content/test.jpg b/src/test/content/test.jpg
index 110b3d6b666..110b3d6b666 100644
--- a/src/test/html/content/test.jpg
+++ b/src/test/content/test.jpg
diff --git a/src/test/html/content/test.png b/src/test/content/test.png
index 353869b3c49..353869b3c49 100644
--- a/src/test/html/content/test.png
+++ b/src/test/content/test.png
diff --git a/src/test/html/content/test_DOMParser.html b/src/test/content/test_DOMParser.html
index c773116e3f6..c773116e3f6 100644
--- a/src/test/html/content/test_DOMParser.html
+++ b/src/test/content/test_DOMParser.html
diff --git a/src/test/html/content/test_Event.html b/src/test/content/test_Event.html
index 0643df62e44..0643df62e44 100644
--- a/src/test/html/content/test_Event.html
+++ b/src/test/content/test_Event.html
diff --git a/src/test/html/content/test_MouseEvent.html b/src/test/content/test_MouseEvent.html
index de826380c3b..de826380c3b 100644
--- a/src/test/html/content/test_MouseEvent.html
+++ b/src/test/content/test_MouseEvent.html
diff --git a/src/test/html/content/test_childnodes.html b/src/test/content/test_childnodes.html
index 205a6124959..205a6124959 100644
--- a/src/test/html/content/test_childnodes.html
+++ b/src/test/content/test_childnodes.html
diff --git a/src/test/html/content/test_collections.html b/src/test/content/test_collections.html
index 323ee450938..323ee450938 100644
--- a/src/test/html/content/test_collections.html
+++ b/src/test/content/test_collections.html
diff --git a/src/test/html/content/test_create_element.html b/src/test/content/test_create_element.html
index f62c599504d..f62c599504d 100644
--- a/src/test/html/content/test_create_element.html
+++ b/src/test/content/test_create_element.html
diff --git a/src/test/html/content/test_documentElement.html b/src/test/content/test_documentElement.html
index efe68e086d0..efe68e086d0 100644
--- a/src/test/html/content/test_documentElement.html
+++ b/src/test/content/test_documentElement.html
diff --git a/src/test/html/content/test_document_body.html b/src/test/content/test_document_body.html
index 290068d1fcf..290068d1fcf 100644
--- a/src/test/html/content/test_document_body.html
+++ b/src/test/content/test_document_body.html
diff --git a/src/test/html/content/test_document_characterSet.html b/src/test/content/test_document_characterSet.html
index c1d5ed9f103..c1d5ed9f103 100644
--- a/src/test/html/content/test_document_characterSet.html
+++ b/src/test/content/test_document_characterSet.html
diff --git a/src/test/html/content/test_document_characterSet_default.html b/src/test/content/test_document_characterSet_default.html
index 08fc63075e2..08fc63075e2 100644
--- a/src/test/html/content/test_document_characterSet_default.html
+++ b/src/test/content/test_document_characterSet_default.html
diff --git a/src/test/html/content/test_document_characterSet_invalid.html b/src/test/content/test_document_characterSet_invalid.html
index 80984ad3e45..80984ad3e45 100644
--- a/src/test/html/content/test_document_characterSet_invalid.html
+++ b/src/test/content/test_document_characterSet_invalid.html
diff --git a/src/test/html/content/test_document_characterSet_long.html b/src/test/content/test_document_characterSet_long.html
index abf547127a8..abf547127a8 100644
--- a/src/test/html/content/test_document_characterSet_long.html
+++ b/src/test/content/test_document_characterSet_long.html
diff --git a/src/test/html/content/test_document_characterSet_short.html b/src/test/content/test_document_characterSet_short.html
index 358d4f8ba74..358d4f8ba74 100644
--- a/src/test/html/content/test_document_characterSet_short.html
+++ b/src/test/content/test_document_characterSet_short.html
diff --git a/src/test/html/content/test_document_compatMode.html b/src/test/content/test_document_compatMode.html
index 754512c9a3b..754512c9a3b 100644
--- a/src/test/html/content/test_document_compatMode.html
+++ b/src/test/content/test_document_compatMode.html
diff --git a/src/test/html/content/test_document_compatMode_loose.html b/src/test/content/test_document_compatMode_loose.html
index 8a03b25e5a1..8a03b25e5a1 100644
--- a/src/test/html/content/test_document_compatMode_loose.html
+++ b/src/test/content/test_document_compatMode_loose.html
diff --git a/src/test/html/content/test_document_compatMode_strict.html b/src/test/content/test_document_compatMode_strict.html
index dd1b566735e..dd1b566735e 100644
--- a/src/test/html/content/test_document_compatMode_strict.html
+++ b/src/test/content/test_document_compatMode_strict.html
diff --git a/src/test/html/content/test_document_contenttype.html b/src/test/content/test_document_contenttype.html
index 4a63a654547..4a63a654547 100644
--- a/src/test/html/content/test_document_contenttype.html
+++ b/src/test/content/test_document_contenttype.html
diff --git a/src/test/html/content/test_document_createProcessingInstruction.html b/src/test/content/test_document_createProcessingInstruction.html
index c313f34a4de..c313f34a4de 100644
--- a/src/test/html/content/test_document_createProcessingInstruction.html
+++ b/src/test/content/test_document_createProcessingInstruction.html
diff --git a/src/test/html/content/test_document_doctype.html b/src/test/content/test_document_doctype.html
index 0f16cccbff7..0f16cccbff7 100644
--- a/src/test/html/content/test_document_doctype.html
+++ b/src/test/content/test_document_doctype.html
diff --git a/src/test/html/content/test_document_getElementById.html b/src/test/content/test_document_getElementById.html
index ffdca48e8af..ffdca48e8af 100644
--- a/src/test/html/content/test_document_getElementById.html
+++ b/src/test/content/test_document_getElementById.html
diff --git a/src/test/html/content/test_document_getElementsByName.html b/src/test/content/test_document_getElementsByName.html
index ab69292eced..ab69292eced 100644
--- a/src/test/html/content/test_document_getElementsByName.html
+++ b/src/test/content/test_document_getElementsByName.html
diff --git a/src/test/html/content/test_document_head.html b/src/test/content/test_document_head.html
index 1993e297f97..1993e297f97 100644
--- a/src/test/html/content/test_document_head.html
+++ b/src/test/content/test_document_head.html
diff --git a/src/test/html/content/test_document_implementation.html b/src/test/content/test_document_implementation.html
index 57dabd13e71..57dabd13e71 100644
--- a/src/test/html/content/test_document_implementation.html
+++ b/src/test/content/test_document_implementation.html
diff --git a/src/test/html/content/test_document_set_node_value.html b/src/test/content/test_document_set_node_value.html
index 20762a93674..20762a93674 100644
--- a/src/test/html/content/test_document_set_node_value.html
+++ b/src/test/content/test_document_set_node_value.html
diff --git a/src/test/html/content/test_document_title_nontextchildren.html b/src/test/content/test_document_title_nontextchildren.html
index 9875a149be7..9875a149be7 100644
--- a/src/test/html/content/test_document_title_nontextchildren.html
+++ b/src/test/content/test_document_title_nontextchildren.html
diff --git a/src/test/html/content/test_document_url.html b/src/test/content/test_document_url.html
index fc0d8c338c1..fc0d8c338c1 100644
--- a/src/test/html/content/test_document_url.html
+++ b/src/test/content/test_document_url.html
diff --git a/src/test/html/content/test_element_attribute.html b/src/test/content/test_element_attribute.html
index 8631138c767..8631138c767 100644
--- a/src/test/html/content/test_element_attribute.html
+++ b/src/test/content/test_element_attribute.html
diff --git a/src/test/html/content/test_element_attributes.html b/src/test/content/test_element_attributes.html
index c489fad9f87..c489fad9f87 100644
--- a/src/test/html/content/test_element_attributes.html
+++ b/src/test/content/test_element_attributes.html
diff --git a/src/test/html/content/test_empty_clientrect.html b/src/test/content/test_empty_clientrect.html
index 3671ca5bcc4..3671ca5bcc4 100644
--- a/src/test/html/content/test_empty_clientrect.html
+++ b/src/test/content/test_empty_clientrect.html
diff --git a/src/test/html/content/test_event_dispatch.html b/src/test/content/test_event_dispatch.html
index cf9eb4ee675..cf9eb4ee675 100644
--- a/src/test/html/content/test_event_dispatch.html
+++ b/src/test/content/test_event_dispatch.html
diff --git a/src/test/html/content/test_event_dispatch_dynamic.html b/src/test/content/test_event_dispatch_dynamic.html
index 3b852fe497d..3b852fe497d 100644
--- a/src/test/html/content/test_event_dispatch_dynamic.html
+++ b/src/test/content/test_event_dispatch_dynamic.html
diff --git a/src/test/html/content/test_event_dispatch_order.html b/src/test/content/test_event_dispatch_order.html
index e1b381d0b77..e1b381d0b77 100644
--- a/src/test/html/content/test_event_dispatch_order.html
+++ b/src/test/content/test_event_dispatch_order.html
diff --git a/src/test/html/content/test_event_listener.html b/src/test/content/test_event_listener.html
index 5096d76349a..5096d76349a 100644
--- a/src/test/html/content/test_event_listener.html
+++ b/src/test/content/test_event_listener.html
diff --git a/src/test/html/content/test_exception.html b/src/test/content/test_exception.html
index b2cfda177d4..b2cfda177d4 100644
--- a/src/test/html/content/test_exception.html
+++ b/src/test/content/test_exception.html
diff --git a/src/test/html/content/test_getBoundingClientRect.html b/src/test/content/test_getBoundingClientRect.html
index 4f25d97141c..4f25d97141c 100644
--- a/src/test/html/content/test_getBoundingClientRect.html
+++ b/src/test/content/test_getBoundingClientRect.html
diff --git a/src/test/html/content/test_getElementsByTagName.html b/src/test/content/test_getElementsByTagName.html
index 34d31d0e318..34d31d0e318 100644
--- a/src/test/html/content/test_getElementsByTagName.html
+++ b/src/test/content/test_getElementsByTagName.html
diff --git a/src/test/html/content/test_global.html b/src/test/content/test_global.html
index 24cfbc5f6ba..24cfbc5f6ba 100644
--- a/src/test/html/content/test_global.html
+++ b/src/test/content/test_global.html
diff --git a/src/test/html/content/test_htmlcollection.html b/src/test/content/test_htmlcollection.html
index e024a331e80..e024a331e80 100644
--- a/src/test/html/content/test_htmlcollection.html
+++ b/src/test/content/test_htmlcollection.html
diff --git a/src/test/html/content/test_img_width_height.html b/src/test/content/test_img_width_height.html
index b748db924f5..b748db924f5 100644
--- a/src/test/html/content/test_img_width_height.html
+++ b/src/test/content/test_img_width_height.html
diff --git a/src/test/html/content/test_innerHTML.html b/src/test/content/test_innerHTML.html
index 1f0cf235526..1f0cf235526 100644
--- a/src/test/html/content/test_innerHTML.html
+++ b/src/test/content/test_innerHTML.html
diff --git a/src/test/html/content/test_load_event.html b/src/test/content/test_load_event.html
index fd8502fcd7d..fd8502fcd7d 100644
--- a/src/test/html/content/test_load_event.html
+++ b/src/test/content/test_load_event.html
diff --git a/src/test/html/content/test_mainelement.html b/src/test/content/test_mainelement.html
index 2aaa791eb95..2aaa791eb95 100644
--- a/src/test/html/content/test_mainelement.html
+++ b/src/test/content/test_mainelement.html
diff --git a/src/test/html/content/test_navigator.html b/src/test/content/test_navigator.html
index 8ec7fc0ab3e..8ec7fc0ab3e 100644
--- a/src/test/html/content/test_navigator.html
+++ b/src/test/content/test_navigator.html
diff --git a/src/test/html/content/test_node_contains.html b/src/test/content/test_node_contains.html
index 400b407b82d..400b407b82d 100644
--- a/src/test/html/content/test_node_contains.html
+++ b/src/test/content/test_node_contains.html
diff --git a/src/test/html/content/test_node_insertBefore.html b/src/test/content/test_node_insertBefore.html
index 8ee4e6e68b2..8ee4e6e68b2 100644
--- a/src/test/html/content/test_node_insertBefore.html
+++ b/src/test/content/test_node_insertBefore.html
diff --git a/src/test/html/content/test_node_isEqualNode.html b/src/test/content/test_node_isEqualNode.html
index e7c55743725..e7c55743725 100644
--- a/src/test/html/content/test_node_isEqualNode.html
+++ b/src/test/content/test_node_isEqualNode.html
diff --git a/src/test/html/content/test_node_replaceChild.html b/src/test/content/test_node_replaceChild.html
index a9a4703cc9c..a9a4703cc9c 100644
--- a/src/test/html/content/test_node_replaceChild.html
+++ b/src/test/content/test_node_replaceChild.html
diff --git a/src/test/html/content/test_parentnodes.html b/src/test/content/test_parentnodes.html
index 2131b7270b2..2131b7270b2 100644
--- a/src/test/html/content/test_parentnodes.html
+++ b/src/test/content/test_parentnodes.html
diff --git a/src/test/html/content/test_prototypes.html b/src/test/content/test_prototypes.html
index 93019abe424..93019abe424 100644
--- a/src/test/html/content/test_prototypes.html
+++ b/src/test/content/test_prototypes.html
diff --git a/src/test/html/content/test_proxy_setter.html b/src/test/content/test_proxy_setter.html
index 0d18f111599..0d18f111599 100644
--- a/src/test/html/content/test_proxy_setter.html
+++ b/src/test/content/test_proxy_setter.html
diff --git a/src/test/html/content/test_script_src_attribute.html b/src/test/content/test_script_src_attribute.html
index 7f3b298990c..7f3b298990c 100644
--- a/src/test/html/content/test_script_src_attribute.html
+++ b/src/test/content/test_script_src_attribute.html
diff --git a/src/test/html/content/test_textcontent.html b/src/test/content/test_textcontent.html
index b56c05d48a9..b56c05d48a9 100644
--- a/src/test/html/content/test_textcontent.html
+++ b/src/test/content/test_textcontent.html
diff --git a/src/test/html/content/test_title.html b/src/test/content/test_title.html
index da3dcfc7112..da3dcfc7112 100644
--- a/src/test/html/content/test_title.html
+++ b/src/test/content/test_title.html
diff --git a/src/test/html/content/test_union.html b/src/test/content/test_union.html
index fd2bf84f96b..fd2bf84f96b 100644
--- a/src/test/html/content/test_union.html
+++ b/src/test/content/test_union.html
diff --git a/src/test/html/content/test_window.html b/src/test/content/test_window.html
index f532929a124..f532929a124 100644
--- a/src/test/html/content/test_window.html
+++ b/src/test/content/test_window.html