servo: Merge #1859 - Move content tests to src/test/content for consistency (from kmcallister:move); r=jdm
authorKeegan McAllister <kmcallister@mozilla.com>
Fri, 07 Mar 2014 19:19:24 -0500
changeset 334136 6bb6180f0d7944295f97b0a2628ca3a3ee4a22e5
parent 334135 8eb833430171a698af4e72ea37c5be3b93ed113d
child 334137 aca5db1d8e40580f7b227230d92acc3cfa03a1e6
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdm
servo: Merge #1859 - Move content tests to src/test/content for consistency (from kmcallister:move); r=jdm And update `CONTRIBUTING.md`. Source-Repo: https://github.com/servo/servo Source-Revision: d79c8a10cfd07be712826d831394814cdfec71af
servo/CONTRIBUTING.md
servo/mk/check.mk
servo/src/test/content/harness.js
servo/src/test/content/test.jpg
servo/src/test/content/test.png
servo/src/test/content/test_DOMParser.html
servo/src/test/content/test_Event.html
servo/src/test/content/test_MouseEvent.html
servo/src/test/content/test_childnodes.html
servo/src/test/content/test_collections.html
servo/src/test/content/test_create_element.html
servo/src/test/content/test_documentElement.html
servo/src/test/content/test_document_body.html
servo/src/test/content/test_document_characterSet.html
servo/src/test/content/test_document_characterSet_default.html
servo/src/test/content/test_document_characterSet_invalid.html
servo/src/test/content/test_document_characterSet_long.html
servo/src/test/content/test_document_characterSet_short.html
servo/src/test/content/test_document_compatMode.html
servo/src/test/content/test_document_compatMode_loose.html
servo/src/test/content/test_document_compatMode_strict.html
servo/src/test/content/test_document_contenttype.html
servo/src/test/content/test_document_createProcessingInstruction.html
servo/src/test/content/test_document_doctype.html
servo/src/test/content/test_document_getElementById.html
servo/src/test/content/test_document_getElementsByName.html
servo/src/test/content/test_document_head.html
servo/src/test/content/test_document_implementation.html
servo/src/test/content/test_document_set_node_value.html
servo/src/test/content/test_document_title_nontextchildren.html
servo/src/test/content/test_document_url.html
servo/src/test/content/test_element_attribute.html
servo/src/test/content/test_element_attributes.html
servo/src/test/content/test_empty_clientrect.html
servo/src/test/content/test_event_dispatch.html
servo/src/test/content/test_event_dispatch_dynamic.html
servo/src/test/content/test_event_dispatch_order.html
servo/src/test/content/test_event_listener.html
servo/src/test/content/test_exception.html
servo/src/test/content/test_getBoundingClientRect.html
servo/src/test/content/test_getElementsByTagName.html
servo/src/test/content/test_global.html
servo/src/test/content/test_htmlcollection.html
servo/src/test/content/test_img_width_height.html
servo/src/test/content/test_innerHTML.html
servo/src/test/content/test_load_event.html
servo/src/test/content/test_mainelement.html
servo/src/test/content/test_navigator.html
servo/src/test/content/test_node_contains.html
servo/src/test/content/test_node_insertBefore.html
servo/src/test/content/test_node_isEqualNode.html
servo/src/test/content/test_node_replaceChild.html
servo/src/test/content/test_parentnodes.html
servo/src/test/content/test_prototypes.html
servo/src/test/content/test_proxy_setter.html
servo/src/test/content/test_script_src_attribute.html
servo/src/test/content/test_textcontent.html
servo/src/test/content/test_title.html
servo/src/test/content/test_union.html
servo/src/test/content/test_window.html
servo/src/test/html/content/harness.js
servo/src/test/html/content/test.jpg
servo/src/test/html/content/test.png
servo/src/test/html/content/test_DOMParser.html
servo/src/test/html/content/test_Event.html
servo/src/test/html/content/test_MouseEvent.html
servo/src/test/html/content/test_childnodes.html
servo/src/test/html/content/test_collections.html
servo/src/test/html/content/test_create_element.html
servo/src/test/html/content/test_documentElement.html
servo/src/test/html/content/test_document_body.html
servo/src/test/html/content/test_document_characterSet.html
servo/src/test/html/content/test_document_characterSet_default.html
servo/src/test/html/content/test_document_characterSet_invalid.html
servo/src/test/html/content/test_document_characterSet_long.html
servo/src/test/html/content/test_document_characterSet_short.html
servo/src/test/html/content/test_document_compatMode.html
servo/src/test/html/content/test_document_compatMode_loose.html
servo/src/test/html/content/test_document_compatMode_strict.html
servo/src/test/html/content/test_document_contenttype.html
servo/src/test/html/content/test_document_createProcessingInstruction.html
servo/src/test/html/content/test_document_doctype.html
servo/src/test/html/content/test_document_getElementById.html
servo/src/test/html/content/test_document_getElementsByName.html
servo/src/test/html/content/test_document_head.html
servo/src/test/html/content/test_document_implementation.html
servo/src/test/html/content/test_document_set_node_value.html
servo/src/test/html/content/test_document_title_nontextchildren.html
servo/src/test/html/content/test_document_url.html
servo/src/test/html/content/test_element_attribute.html
servo/src/test/html/content/test_element_attributes.html
servo/src/test/html/content/test_empty_clientrect.html
servo/src/test/html/content/test_event_dispatch.html
servo/src/test/html/content/test_event_dispatch_dynamic.html
servo/src/test/html/content/test_event_dispatch_order.html
servo/src/test/html/content/test_event_listener.html
servo/src/test/html/content/test_exception.html
servo/src/test/html/content/test_getBoundingClientRect.html
servo/src/test/html/content/test_getElementsByTagName.html
servo/src/test/html/content/test_global.html
servo/src/test/html/content/test_htmlcollection.html
servo/src/test/html/content/test_img_width_height.html
servo/src/test/html/content/test_innerHTML.html
servo/src/test/html/content/test_load_event.html
servo/src/test/html/content/test_mainelement.html
servo/src/test/html/content/test_navigator.html
servo/src/test/html/content/test_node_contains.html
servo/src/test/html/content/test_node_insertBefore.html
servo/src/test/html/content/test_node_isEqualNode.html
servo/src/test/html/content/test_node_replaceChild.html
servo/src/test/html/content/test_parentnodes.html
servo/src/test/html/content/test_prototypes.html
servo/src/test/html/content/test_proxy_setter.html
servo/src/test/html/content/test_script_src_attribute.html
servo/src/test/html/content/test_textcontent.html
servo/src/test/html/content/test_title.html
servo/src/test/html/content/test_union.html
servo/src/test/html/content/test_window.html
--- a/servo/CONTRIBUTING.md
+++ b/servo/CONTRIBUTING.md
@@ -21,18 +21,19 @@ follow this format, even those from core
 
 - Don't put submodule updates in your pull request unless they are to landed
   commits.
 
 - If your patch is not getting reviewed or you need a specific person to review
   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).
 
 ## Conduct
 
 We follow the [Rust Code of Conduct](https://github.com/mozilla/rust/wiki/Note-development-policy#wiki-conduct).
 
 
--- a/servo/mk/check.mk
+++ b/servo/mk/check.mk
@@ -84,14 +84,14 @@ check-ref: reftest
 	@$(call E, check: reftests with GPU rendering)
 	$(Q)./reftest $(S)src/test/ref/*.list
 	@$(call E, check: reftests with CPU rendering)
 	$(Q)./reftest $(S)src/test/ref/*.list -- -c
 
 .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:
 	@$(call E, check: tidy)
 	$(Q)python $(S)src/etc/tidy.py $(S)src
rename from servo/src/test/html/content/harness.js
rename to servo/src/test/content/harness.js
rename from servo/src/test/html/content/test.jpg
rename to servo/src/test/content/test.jpg
rename from servo/src/test/html/content/test.png
rename to servo/src/test/content/test.png
rename from servo/src/test/html/content/test_DOMParser.html
rename to servo/src/test/content/test_DOMParser.html
rename from servo/src/test/html/content/test_Event.html
rename to servo/src/test/content/test_Event.html
rename from servo/src/test/html/content/test_MouseEvent.html
rename to servo/src/test/content/test_MouseEvent.html
rename from servo/src/test/html/content/test_childnodes.html
rename to servo/src/test/content/test_childnodes.html
rename from servo/src/test/html/content/test_collections.html
rename to servo/src/test/content/test_collections.html
rename from servo/src/test/html/content/test_create_element.html
rename to servo/src/test/content/test_create_element.html
rename from servo/src/test/html/content/test_documentElement.html
rename to servo/src/test/content/test_documentElement.html
rename from servo/src/test/html/content/test_document_body.html
rename to servo/src/test/content/test_document_body.html
rename from servo/src/test/html/content/test_document_characterSet.html
rename to servo/src/test/content/test_document_characterSet.html
rename from servo/src/test/html/content/test_document_characterSet_default.html
rename to servo/src/test/content/test_document_characterSet_default.html
rename from servo/src/test/html/content/test_document_characterSet_invalid.html
rename to servo/src/test/content/test_document_characterSet_invalid.html
rename from servo/src/test/html/content/test_document_characterSet_long.html
rename to servo/src/test/content/test_document_characterSet_long.html
rename from servo/src/test/html/content/test_document_characterSet_short.html
rename to servo/src/test/content/test_document_characterSet_short.html
rename from servo/src/test/html/content/test_document_compatMode.html
rename to servo/src/test/content/test_document_compatMode.html
rename from servo/src/test/html/content/test_document_compatMode_loose.html
rename to servo/src/test/content/test_document_compatMode_loose.html
rename from servo/src/test/html/content/test_document_compatMode_strict.html
rename to servo/src/test/content/test_document_compatMode_strict.html
rename from servo/src/test/html/content/test_document_contenttype.html
rename to servo/src/test/content/test_document_contenttype.html
rename from servo/src/test/html/content/test_document_createProcessingInstruction.html
rename to servo/src/test/content/test_document_createProcessingInstruction.html
rename from servo/src/test/html/content/test_document_doctype.html
rename to servo/src/test/content/test_document_doctype.html
rename from servo/src/test/html/content/test_document_getElementById.html
rename to servo/src/test/content/test_document_getElementById.html
rename from servo/src/test/html/content/test_document_getElementsByName.html
rename to servo/src/test/content/test_document_getElementsByName.html
rename from servo/src/test/html/content/test_document_head.html
rename to servo/src/test/content/test_document_head.html
rename from servo/src/test/html/content/test_document_implementation.html
rename to servo/src/test/content/test_document_implementation.html
rename from servo/src/test/html/content/test_document_set_node_value.html
rename to servo/src/test/content/test_document_set_node_value.html
rename from servo/src/test/html/content/test_document_title_nontextchildren.html
rename to servo/src/test/content/test_document_title_nontextchildren.html
rename from servo/src/test/html/content/test_document_url.html
rename to servo/src/test/content/test_document_url.html
rename from servo/src/test/html/content/test_element_attribute.html
rename to servo/src/test/content/test_element_attribute.html
rename from servo/src/test/html/content/test_element_attributes.html
rename to servo/src/test/content/test_element_attributes.html
rename from servo/src/test/html/content/test_empty_clientrect.html
rename to servo/src/test/content/test_empty_clientrect.html
rename from servo/src/test/html/content/test_event_dispatch.html
rename to servo/src/test/content/test_event_dispatch.html
rename from servo/src/test/html/content/test_event_dispatch_dynamic.html
rename to servo/src/test/content/test_event_dispatch_dynamic.html
rename from servo/src/test/html/content/test_event_dispatch_order.html
rename to servo/src/test/content/test_event_dispatch_order.html
rename from servo/src/test/html/content/test_event_listener.html
rename to servo/src/test/content/test_event_listener.html
rename from servo/src/test/html/content/test_exception.html
rename to servo/src/test/content/test_exception.html
rename from servo/src/test/html/content/test_getBoundingClientRect.html
rename to servo/src/test/content/test_getBoundingClientRect.html
rename from servo/src/test/html/content/test_getElementsByTagName.html
rename to servo/src/test/content/test_getElementsByTagName.html
rename from servo/src/test/html/content/test_global.html
rename to servo/src/test/content/test_global.html
rename from servo/src/test/html/content/test_htmlcollection.html
rename to servo/src/test/content/test_htmlcollection.html
rename from servo/src/test/html/content/test_img_width_height.html
rename to servo/src/test/content/test_img_width_height.html
rename from servo/src/test/html/content/test_innerHTML.html
rename to servo/src/test/content/test_innerHTML.html
rename from servo/src/test/html/content/test_load_event.html
rename to servo/src/test/content/test_load_event.html
rename from servo/src/test/html/content/test_mainelement.html
rename to servo/src/test/content/test_mainelement.html
rename from servo/src/test/html/content/test_navigator.html
rename to servo/src/test/content/test_navigator.html
rename from servo/src/test/html/content/test_node_contains.html
rename to servo/src/test/content/test_node_contains.html
rename from servo/src/test/html/content/test_node_insertBefore.html
rename to servo/src/test/content/test_node_insertBefore.html
rename from servo/src/test/html/content/test_node_isEqualNode.html
rename to servo/src/test/content/test_node_isEqualNode.html
rename from servo/src/test/html/content/test_node_replaceChild.html
rename to servo/src/test/content/test_node_replaceChild.html
rename from servo/src/test/html/content/test_parentnodes.html
rename to servo/src/test/content/test_parentnodes.html
rename from servo/src/test/html/content/test_prototypes.html
rename to servo/src/test/content/test_prototypes.html
rename from servo/src/test/html/content/test_proxy_setter.html
rename to servo/src/test/content/test_proxy_setter.html
rename from servo/src/test/html/content/test_script_src_attribute.html
rename to servo/src/test/content/test_script_src_attribute.html
rename from servo/src/test/html/content/test_textcontent.html
rename to servo/src/test/content/test_textcontent.html
rename from servo/src/test/html/content/test_title.html
rename to servo/src/test/content/test_title.html
rename from servo/src/test/html/content/test_union.html
rename to servo/src/test/content/test_union.html
rename from servo/src/test/html/content/test_window.html
rename to servo/src/test/content/test_window.html