Move the test harnesses into test/.

This is preparation for removing the `servo-` prefixes from the various
Servo components.

71 files changed, 4 insertions, 4 deletions

diff --git a/configure b/configure
index 27edb45ae41..133bccc6882 100755
--- a/configure
+++ b/configure
@@ -452,7 +452,7 @@ done
 make_dir ${CFG_BUILD_DIR}src/components/servo-util
 make_dir ${CFG_BUILD_DIR}src/components/servo-net
 make_dir ${CFG_BUILD_DIR}src/components/servo-gfx
-make_dir src/test/ref
+make_dir src/test/html/ref
 make_dir src/compiler/rust
 
 # TODO: don't run configure on submodules unless necessary. For an example,
diff --git a/mk/check.mk b/mk/check.mk
index 9ee9473c8c8..42adc18516d 100644
--- a/mk/check.mk
+++ b/mk/check.mk
@@ -20,10 +20,10 @@ $(eval $(call DEF_SUBMODULE_TEST_RULES,$(submodule))))
 servo-test: $(DEPS_servo)
 	$(RUSTC) $(RFLAGS_servo) --test -o $@ $<
 
-reftest: $(S)src/reftest/reftest.rs servo
+reftest: $(S)src/test/harness/reftest/reftest.rs servo
 	$(RUSTC) $(RFLAGS_servo) -o $@ $< -L .
 
-contenttest: $(S)src/contenttest/contenttest.rs servo
+contenttest: $(S)src/test/harness/contenttest/contenttest.rs servo
 	$(RUSTC) $(RFLAGS_servo) -o $@ $< -L .
 
 DEPS_CHECK_TARGETS_ALL = $(addprefix check-,$(DEPS_CHECK_ALL))
@@ -39,7 +39,7 @@ check-servo: servo-test
 	./servo-test $(TESTNAME)
 
 check-ref: reftest
-	./reftest --source-dir=$(S)/src/test/ref --work-dir=src/test/ref $(TESTNAME)
+	./reftest --source-dir=$(S)/src/test/html/ref --work-dir=src/test/html/ref $(TESTNAME)
 
 check-content: contenttest
 	./contenttest --source-dir=$(S)/src/test/content $(TESTNAME)
diff --git a/src/components/contenttest/contenttest.rs b/src/test/harness/contenttest/contenttest.rs
index 0815cf439e0..0815cf439e0 100644
--- a/src/components/contenttest/contenttest.rs
+++ b/src/test/harness/contenttest/contenttest.rs
diff --git a/src/components/reftest/rasterize.py b/src/test/harness/reftest/rasterize.py
index 44170e142a8..44170e142a8 100644
--- a/src/components/reftest/rasterize.py
+++ b/src/test/harness/reftest/rasterize.py
diff --git a/src/components/reftest/reftest.rs b/src/test/harness/reftest/reftest.rs
index 8ba59299148..8ba59299148 100644
--- a/src/components/reftest/reftest.rs
+++ b/src/test/harness/reftest/reftest.rs
diff --git a/src/test/about-mozilla.html b/src/test/html/about-mozilla.html
index b392ddcad61..b392ddcad61 100644
--- a/src/test/about-mozilla.html
+++ b/src/test/html/about-mozilla.html
diff --git a/src/test/acid1.html b/src/test/html/acid1.html
index 88d5b325bd2..88d5b325bd2 100644
--- a/src/test/acid1.html
+++ b/src/test/html/acid1.html
diff --git a/src/test/combining-character-sequences.html b/src/test/html/combining-character-sequences.html
index 086429081ac..086429081ac 100644
--- a/src/test/combining-character-sequences.html
+++ b/src/test/html/combining-character-sequences.html
diff --git a/src/test/content/harness.js b/src/test/html/content/harness.js
index de2eec8bcf9..de2eec8bcf9 100644
--- a/src/test/content/harness.js
+++ b/src/test/html/content/harness.js
diff --git a/src/test/content/test_prototypes.html b/src/test/html/content/test_prototypes.html
index 95d33713711..95d33713711 100644
--- a/src/test/content/test_prototypes.html
+++ b/src/test/html/content/test_prototypes.html
diff --git a/src/test/content/test_prototypes.js b/src/test/html/content/test_prototypes.js
index 327843439f5..327843439f5 100644
--- a/src/test/content/test_prototypes.js
+++ b/src/test/html/content/test_prototypes.js
diff --git a/src/test/demo.css b/src/test/html/demo.css
index 4f85b745150..4f85b745150 100644
--- a/src/test/demo.css
+++ b/src/test/html/demo.css
diff --git a/src/test/demo.html b/src/test/html/demo.html
index b840417f499..b840417f499 100644
--- a/src/test/demo.html
+++ b/src/test/html/demo.html
diff --git a/src/test/head_link_test.html b/src/test/html/head_link_test.html
index cbab0074406..cbab0074406 100644
--- a/src/test/head_link_test.html
+++ b/src/test/html/head_link_test.html
diff --git a/src/test/hello.html b/src/test/html/hello.html
index 9907293fa9b..9907293fa9b 100644
--- a/src/test/hello.html
+++ b/src/test/html/hello.html
diff --git a/src/test/ligatures.html b/src/test/html/ligatures.html
index a7ed1765750..a7ed1765750 100644
--- a/src/test/ligatures.html
+++ b/src/test/html/ligatures.html
diff --git a/src/test/lipsum.html b/src/test/html/lipsum.html
index 39afaebe633..39afaebe633 100644
--- a/src/test/lipsum.html
+++ b/src/test/html/lipsum.html
diff --git a/src/test/lots_of_background_colors.css b/src/test/html/lots_of_background_colors.css
index 6c2d2f10c57..6c2d2f10c57 100644
--- a/src/test/lots_of_background_colors.css
+++ b/src/test/html/lots_of_background_colors.css
diff --git a/src/test/mojira.html b/src/test/html/mojira.html
index 8011acd66af..8011acd66af 100644
--- a/src/test/mojira.html
+++ b/src/test/html/mojira.html
diff --git a/src/test/ref/blank.html b/src/test/html/ref/blank.html
index eaca3f49fd1..eaca3f49fd1 100644
--- a/src/test/ref/blank.html
+++ b/src/test/html/ref/blank.html
diff --git a/src/test/ref/boxes.png b/src/test/html/ref/boxes.png
index 10119280ce1..10119280ce1 100644
--- a/src/test/ref/boxes.png
+++ b/src/test/html/ref/boxes.png
diff --git a/src/test/ref/compute_height_width.html b/src/test/html/ref/compute_height_width.html
index 5ecbdf0330f..5ecbdf0330f 100644
--- a/src/test/ref/compute_height_width.html
+++ b/src/test/html/ref/compute_height_width.html
diff --git a/src/test/ref/height_compute.css b/src/test/html/ref/height_compute.css
index 9e1c7fb9679..9e1c7fb9679 100644
--- a/src/test/ref/height_compute.css
+++ b/src/test/html/ref/height_compute.css
diff --git a/src/test/ref/height_compute.html b/src/test/html/ref/height_compute.html
index c1610bb4d91..c1610bb4d91 100644
--- a/src/test/ref/height_compute.html
+++ b/src/test/html/ref/height_compute.html
diff --git a/src/test/ref/height_compute_reset.css b/src/test/html/ref/height_compute_reset.css
index 41031e2a517..41031e2a517 100644
--- a/src/test/ref/height_compute_reset.css
+++ b/src/test/html/ref/height_compute_reset.css
diff --git a/src/test/ref/height_compute_reset.html b/src/test/html/ref/height_compute_reset.html
index 2440844096c..2440844096c 100644
--- a/src/test/ref/height_compute_reset.html
+++ b/src/test/html/ref/height_compute_reset.html
diff --git a/src/test/ref/height_width.css b/src/test/html/ref/height_width.css
index 8e5f58aca10..8e5f58aca10 100644
--- a/src/test/ref/height_width.css
+++ b/src/test/html/ref/height_width.css
diff --git a/src/test/ref/reset.css b/src/test/html/ref/reset.css
index 9ff51ebbb38..9ff51ebbb38 100644
--- a/src/test/ref/reset.css
+++ b/src/test/html/ref/reset.css
diff --git a/src/test/ref/simple-reset.css b/src/test/html/ref/simple-reset.css
index 310d9a70a0e..310d9a70a0e 100644
--- a/src/test/ref/simple-reset.css
+++ b/src/test/html/ref/simple-reset.css
diff --git a/src/test/ref/square.css b/src/test/html/ref/square.css
index f07bbe0595d..f07bbe0595d 100644
--- a/src/test/ref/square.css
+++ b/src/test/html/ref/square.css
diff --git a/src/test/ref/square.html b/src/test/html/ref/square.html
index ac9ace5a979..ac9ace5a979 100644
--- a/src/test/ref/square.html
+++ b/src/test/html/ref/square.html
diff --git a/src/test/ref/test-image.html b/src/test/html/ref/test-image.html
index 323f00da4eb..323f00da4eb 100644
--- a/src/test/ref/test-image.html
+++ b/src/test/html/ref/test-image.html
diff --git a/src/test/small-layout-test.html b/src/test/html/small-layout-test.html
index 4bc0ee50bbf..4bc0ee50bbf 100644
--- a/src/test/small-layout-test.html
+++ b/src/test/html/small-layout-test.html
diff --git a/src/test/small_color_test.css b/src/test/html/small_color_test.css
index 014530c86c8..014530c86c8 100644
--- a/src/test/small_color_test.css
+++ b/src/test/html/small_color_test.css
diff --git a/src/test/small_color_test.html b/src/test/html/small_color_test.html
index 883bb081ba6..883bb081ba6 100644
--- a/src/test/small_color_test.html
+++ b/src/test/html/small_color_test.html
diff --git a/src/test/test-absolute.css b/src/test/html/test-absolute.css
index c4391fcf9bd..c4391fcf9bd 100644
--- a/src/test/test-absolute.css
+++ b/src/test/html/test-absolute.css
diff --git a/src/test/test-absolute.html b/src/test/html/test-absolute.html
index e98b7fbefc7..e98b7fbefc7 100644
--- a/src/test/test-absolute.html
+++ b/src/test/html/test-absolute.html
diff --git a/src/test/test-alert.js b/src/test/html/test-alert.js
index a8ea7ab24b9..a8ea7ab24b9 100644
--- a/src/test/test-alert.js
+++ b/src/test/html/test-alert.js
diff --git a/src/test/test-border.css b/src/test/html/test-border.css
index e797cdfa2d0..e797cdfa2d0 100644
--- a/src/test/test-border.css
+++ b/src/test/html/test-border.css
diff --git a/src/test/test-border.html b/src/test/html/test-border.html
index 56e448e58c1..56e448e58c1 100644
--- a/src/test/test-border.html
+++ b/src/test/html/test-border.html
diff --git a/src/test/test-inline.html b/src/test/html/test-inline.html
index 57d0018264c..57d0018264c 100644
--- a/src/test/test-inline.html
+++ b/src/test/html/test-inline.html
diff --git a/src/test/test-js-alert.html b/src/test/html/test-js-alert.html
index 9d875b04249..9d875b04249 100644
--- a/src/test/test-js-alert.html
+++ b/src/test/html/test-js-alert.html
diff --git a/src/test/test-js-image.html b/src/test/html/test-js-image.html
index 4d899bb9e21..4d899bb9e21 100644
--- a/src/test/test-js-image.html
+++ b/src/test/html/test-js-image.html
diff --git a/src/test/test-js.html b/src/test/html/test-js.html
index a810121d91f..a810121d91f 100644
--- a/src/test/test-js.html
+++ b/src/test/html/test-js.html
diff --git a/src/test/test-many-images-different.html b/src/test/html/test-many-images-different.html
index 7fce43bae3a..7fce43bae3a 100644
--- a/src/test/test-many-images-different.html
+++ b/src/test/html/test-many-images-different.html
diff --git a/src/test/test-many-images.html b/src/test/html/test-many-images.html
index 488a5f30743..488a5f30743 100644
--- a/src/test/test-many-images.html
+++ b/src/test/html/test-many-images.html
diff --git a/src/test/test-text-break.html b/src/test/html/test-text-break.html
index 620a5e4c52c..620a5e4c52c 100644
--- a/src/test/test-text-break.html
+++ b/src/test/html/test-text-break.html
diff --git a/src/test/test-text.html b/src/test/html/test-text.html
index f4a73aba7e7..f4a73aba7e7 100644
--- a/src/test/test-text.html
+++ b/src/test/html/test-text.html
diff --git a/src/test/test.css b/src/test/html/test.css
index 12e7ad86ad0..12e7ad86ad0 100644
--- a/src/test/test.css
+++ b/src/test/html/test.css
diff --git a/src/test/test.html b/src/test/html/test.html
index 7d993f11bc3..7d993f11bc3 100644
--- a/src/test/test.html
+++ b/src/test/html/test.html
diff --git a/src/test/test.jpeg b/src/test/html/test.jpeg
index 3314a53600b..3314a53600b 100644
--- a/src/test/test.jpeg
+++ b/src/test/html/test.jpeg
diff --git a/src/test/test.js b/src/test/html/test.js
index 262c1b4f1b0..262c1b4f1b0 100644
--- a/src/test/test.js
+++ b/src/test/html/test.js
diff --git a/src/test/test_bg_color.html b/src/test/html/test_bg_color.html
index 7672b166b70..7672b166b70 100644
--- a/src/test/test_bg_color.html
+++ b/src/test/html/test_bg_color.html
diff --git a/src/test/test_bg_color_simple.css b/src/test/html/test_bg_color_simple.css
index 6083263c93e..6083263c93e 100644
--- a/src/test/test_bg_color_simple.css
+++ b/src/test/html/test_bg_color_simple.css
diff --git a/src/test/test_bg_color_simple.html b/src/test/html/test_bg_color_simple.html
index b2526594196..b2526594196 100644
--- a/src/test/test_bg_color_simple.html
+++ b/src/test/html/test_bg_color_simple.html
diff --git a/src/test/test_bindings.html b/src/test/html/test_bindings.html
index 1d9fd6de5a0..1d9fd6de5a0 100644
--- a/src/test/test_bindings.html
+++ b/src/test/html/test_bindings.html
diff --git a/src/test/test_bindings.js b/src/test/html/test_bindings.js
index ceee47fe488..ceee47fe488 100644
--- a/src/test/test_bindings.js
+++ b/src/test/html/test_bindings.js
diff --git a/src/test/test_close.html b/src/test/html/test_close.html
index f4c8b185d0d..f4c8b185d0d 100644
--- a/src/test/test_close.html
+++ b/src/test/html/test_close.html
diff --git a/src/test/test_close.js b/src/test/html/test_close.js
index 0f1640bab56..0f1640bab56 100644
--- a/src/test/test_close.js
+++ b/src/test/html/test_close.js
diff --git a/src/test/test_docelem.js b/src/test/html/test_docelem.js
index 18594a4bed7..18594a4bed7 100644
--- a/src/test/test_docelem.js
+++ b/src/test/html/test_docelem.js
diff --git a/src/test/test_getter_time.html b/src/test/html/test_getter_time.html
index 733f78e91b5..733f78e91b5 100644
--- a/src/test/test_getter_time.html
+++ b/src/test/html/test_getter_time.html
diff --git a/src/test/test_getter_time.js b/src/test/html/test_getter_time.js
index afe04e8d103..afe04e8d103 100644
--- a/src/test/test_getter_time.js
+++ b/src/test/html/test_getter_time.js
diff --git a/src/test/test_hammer_layout.css b/src/test/html/test_hammer_layout.css
index 8218b9cab7d..8218b9cab7d 100644
--- a/src/test/test_hammer_layout.css
+++ b/src/test/html/test_hammer_layout.css
diff --git a/src/test/test_hammer_layout.html b/src/test/html/test_hammer_layout.html
index 119d67a1796..119d67a1796 100644
--- a/src/test/test_hammer_layout.html
+++ b/src/test/html/test_hammer_layout.html
diff --git a/src/test/test_hammer_layout.js b/src/test/html/test_hammer_layout.js
index 8312d8a439e..8312d8a439e 100644
--- a/src/test/test_hammer_layout.js
+++ b/src/test/html/test_hammer_layout.js
diff --git a/src/test/test_image_getter.js b/src/test/html/test_image_getter.js
index ea3763c5c37..ea3763c5c37 100644
--- a/src/test/test_image_getter.js
+++ b/src/test/html/test_image_getter.js
diff --git a/src/test/test_inline_boxes.html b/src/test/html/test_inline_boxes.html
index 0d1bf947688..0d1bf947688 100644
--- a/src/test/test_inline_boxes.html
+++ b/src/test/html/test_inline_boxes.html
diff --git a/src/test/test_linking.css b/src/test/html/test_linking.css
index 3445c564d9e..3445c564d9e 100644
--- a/src/test/test_linking.css
+++ b/src/test/html/test_linking.css
diff --git a/src/test/test_timeout.html b/src/test/html/test_timeout.html
index a06832f07a1..a06832f07a1 100644
--- a/src/test/test_timeout.html
+++ b/src/test/html/test_timeout.html
diff --git a/src/test/test_timeout.js b/src/test/html/test_timeout.js
index f3383744d09..f3383744d09 100644
--- a/src/test/test_timeout.js
+++ b/src/test/html/test_timeout.js
diff --git a/src/test/tiny_test.html b/src/test/html/tiny_test.html
index 1a4baf536d7..1a4baf536d7 100644
--- a/src/test/tiny_test.html
+++ b/src/test/html/tiny_test.html