Move the test harnesses into test/.

This is preparation for removing the `servo-` prefixes from the various Servo components.
2025-08-05 13:40:08 +01:00 · 2013-05-20 17:59:05 -07:00 · 2013-05-20 17:59:05 -07:00 · c658c6dea9
commit c658c6dea9
parent 729a5ff441
71 changed files with 4 additions and 4 deletions
--- a/2
+++ b/2
@ -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,
--- 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)
--- a/src/test/harness/contenttest/contenttest.rs
+++ b/src/test/harness/contenttest/contenttest.rs
--- a/src/test/harness/reftest/rasterize.py
+++ b/src/test/harness/reftest/rasterize.py
--- a/src/test/harness/reftest/reftest.rs
+++ b/src/test/harness/reftest/reftest.rs
--- a/src/test/html/about-mozilla.html
+++ b/src/test/html/about-mozilla.html
--- a/src/test/html/acid1.html
+++ b/src/test/html/acid1.html
--- a/src/test/html/combining-character-sequences.html
+++ b/src/test/html/combining-character-sequences.html
--- a/src/test/html/content/harness.js
+++ b/src/test/html/content/harness.js
--- a/src/test/html/content/test_prototypes.html
+++ b/src/test/html/content/test_prototypes.html
--- a/src/test/html/content/test_prototypes.js
+++ b/src/test/html/content/test_prototypes.js
--- a/src/test/html/demo.css
+++ b/src/test/html/demo.css
--- a/src/test/html/demo.html
+++ b/src/test/html/demo.html
--- a/src/test/html/head_link_test.html
+++ b/src/test/html/head_link_test.html
--- a/src/test/html/hello.html
+++ b/src/test/html/hello.html
--- a/src/test/html/ligatures.html
+++ b/src/test/html/ligatures.html
--- a/src/test/html/lipsum.html
+++ b/src/test/html/lipsum.html
--- a/src/test/html/lots_of_background_colors.css
+++ b/src/test/html/lots_of_background_colors.css
--- a/src/test/html/mojira.html
+++ b/src/test/html/mojira.html
--- a/src/test/html/ref/blank.html
+++ b/src/test/html/ref/blank.html
--- a/src/test/html/ref/boxes.png
+++ b/src/test/html/ref/boxes.png
--- a/src/test/html/ref/compute_height_width.html
+++ b/src/test/html/ref/compute_height_width.html
--- a/src/test/html/ref/height_compute.css
+++ b/src/test/html/ref/height_compute.css
--- a/src/test/html/ref/height_compute.html
+++ b/src/test/html/ref/height_compute.html
--- a/src/test/html/ref/height_compute_reset.css
+++ b/src/test/html/ref/height_compute_reset.css
--- a/src/test/html/ref/height_compute_reset.html
+++ b/src/test/html/ref/height_compute_reset.html
--- a/src/test/html/ref/height_width.css
+++ b/src/test/html/ref/height_width.css
--- a/src/test/html/ref/reset.css
+++ b/src/test/html/ref/reset.css
--- a/src/test/html/ref/simple-reset.css
+++ b/src/test/html/ref/simple-reset.css
--- a/src/test/html/ref/square.css
+++ b/src/test/html/ref/square.css
--- a/src/test/html/ref/square.html
+++ b/src/test/html/ref/square.html
--- a/src/test/html/ref/test-image.html
+++ b/src/test/html/ref/test-image.html
--- a/src/test/html/small-layout-test.html
+++ b/src/test/html/small-layout-test.html
--- a/src/test/html/small_color_test.css
+++ b/src/test/html/small_color_test.css
--- a/src/test/html/small_color_test.html
+++ b/src/test/html/small_color_test.html
--- a/src/test/html/test-absolute.css
+++ b/src/test/html/test-absolute.css
--- a/src/test/html/test-absolute.html
+++ b/src/test/html/test-absolute.html
--- a/src/test/html/test-alert.js
+++ b/src/test/html/test-alert.js
--- a/src/test/html/test-border.css
+++ b/src/test/html/test-border.css
--- a/src/test/html/test-border.html
+++ b/src/test/html/test-border.html
--- a/src/test/html/test-inline.html
+++ b/src/test/html/test-inline.html
--- a/src/test/html/test-js-alert.html
+++ b/src/test/html/test-js-alert.html
--- a/src/test/html/test-js-image.html
+++ b/src/test/html/test-js-image.html
--- a/src/test/html/test-js.html
+++ b/src/test/html/test-js.html
--- a/src/test/html/test-many-images-different.html
+++ b/src/test/html/test-many-images-different.html
--- a/src/test/html/test-many-images.html
+++ b/src/test/html/test-many-images.html
--- a/src/test/html/test-text-break.html
+++ b/src/test/html/test-text-break.html
--- a/src/test/html/test-text.html
+++ b/src/test/html/test-text.html
--- a/src/test/html/test.css
+++ b/src/test/html/test.css
--- a/src/test/html/test.html
+++ b/src/test/html/test.html
--- a/src/test/html/test.jpeg
+++ b/src/test/html/test.jpeg
--- a/src/test/html/test.js
+++ b/src/test/html/test.js
--- a/src/test/html/test_bg_color.html
+++ b/src/test/html/test_bg_color.html
--- a/src/test/html/test_bg_color_simple.css
+++ b/src/test/html/test_bg_color_simple.css
--- a/src/test/html/test_bg_color_simple.html
+++ b/src/test/html/test_bg_color_simple.html
--- a/src/test/html/test_bindings.html
+++ b/src/test/html/test_bindings.html
--- a/src/test/html/test_bindings.js
+++ b/src/test/html/test_bindings.js
--- a/src/test/html/test_close.html
+++ b/src/test/html/test_close.html
--- a/src/test/html/test_close.js
+++ b/src/test/html/test_close.js
--- a/src/test/html/test_docelem.js
+++ b/src/test/html/test_docelem.js
--- a/src/test/html/test_getter_time.html
+++ b/src/test/html/test_getter_time.html
--- a/src/test/html/test_getter_time.js
+++ b/src/test/html/test_getter_time.js
--- a/src/test/html/test_hammer_layout.css
+++ b/src/test/html/test_hammer_layout.css
--- a/src/test/html/test_hammer_layout.html
+++ b/src/test/html/test_hammer_layout.html
--- a/src/test/html/test_hammer_layout.js
+++ b/src/test/html/test_hammer_layout.js
--- a/src/test/html/test_image_getter.js
+++ b/src/test/html/test_image_getter.js
--- a/src/test/html/test_inline_boxes.html
+++ b/src/test/html/test_inline_boxes.html
--- a/src/test/html/test_linking.css
+++ b/src/test/html/test_linking.css
--- a/src/test/html/test_timeout.html
+++ b/src/test/html/test_timeout.html
--- a/src/test/html/test_timeout.js
+++ b/src/test/html/test_timeout.js
--- a/src/test/html/tiny_test.html
+++ b/src/test/html/tiny_test.html