From c658c6dea93db2769d1271edd5253f1653162a26 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Mon, 20 May 2013 17:59:05 -0700 Subject: [PATCH] Move the test harnesses into test/. This is preparation for removing the `servo-` prefixes from the various Servo components. --- configure | 2 +- mk/check.mk | 6 +++--- .../harness}/contenttest/contenttest.rs | 0 .../harness}/reftest/rasterize.py | 0 src/{components => test/harness}/reftest/reftest.rs | 0 src/test/{ => html}/about-mozilla.html | 0 src/test/{ => html}/acid1.html | 0 .../{ => html}/combining-character-sequences.html | 0 src/test/{ => html}/content/harness.js | 0 src/test/{ => html}/content/test_prototypes.html | 0 src/test/{ => html}/content/test_prototypes.js | 0 src/test/{ => html}/demo.css | 0 src/test/{ => html}/demo.html | 0 src/test/{ => html}/head_link_test.html | 0 src/test/{ => html}/hello.html | 0 src/test/{ => html}/ligatures.html | 0 src/test/{ => html}/lipsum.html | 0 src/test/{ => html}/lots_of_background_colors.css | 0 src/test/{ => html}/mojira.html | 0 src/test/{ => html}/ref/blank.html | 0 src/test/{ => html}/ref/boxes.png | Bin src/test/{ => html}/ref/compute_height_width.html | 0 src/test/{ => html}/ref/height_compute.css | 0 src/test/{ => html}/ref/height_compute.html | 0 src/test/{ => html}/ref/height_compute_reset.css | 0 src/test/{ => html}/ref/height_compute_reset.html | 0 src/test/{ => html}/ref/height_width.css | 0 src/test/{ => html}/ref/reset.css | 0 src/test/{ => html}/ref/simple-reset.css | 0 src/test/{ => html}/ref/square.css | 0 src/test/{ => html}/ref/square.html | 0 src/test/{ => html}/ref/test-image.html | 0 src/test/{ => html}/small-layout-test.html | 0 src/test/{ => html}/small_color_test.css | 0 src/test/{ => html}/small_color_test.html | 0 src/test/{ => html}/test-absolute.css | 0 src/test/{ => html}/test-absolute.html | 0 src/test/{ => html}/test-alert.js | 0 src/test/{ => html}/test-border.css | 0 src/test/{ => html}/test-border.html | 0 src/test/{ => html}/test-inline.html | 0 src/test/{ => html}/test-js-alert.html | 0 src/test/{ => html}/test-js-image.html | 0 src/test/{ => html}/test-js.html | 0 src/test/{ => html}/test-many-images-different.html | 0 src/test/{ => html}/test-many-images.html | 0 src/test/{ => html}/test-text-break.html | 0 src/test/{ => html}/test-text.html | 0 src/test/{ => html}/test.css | 0 src/test/{ => html}/test.html | 0 src/test/{ => html}/test.jpeg | Bin src/test/{ => html}/test.js | 0 src/test/{ => html}/test_bg_color.html | 0 src/test/{ => html}/test_bg_color_simple.css | 0 src/test/{ => html}/test_bg_color_simple.html | 0 src/test/{ => html}/test_bindings.html | 0 src/test/{ => html}/test_bindings.js | 0 src/test/{ => html}/test_close.html | 0 src/test/{ => html}/test_close.js | 0 src/test/{ => html}/test_docelem.js | 0 src/test/{ => html}/test_getter_time.html | 0 src/test/{ => html}/test_getter_time.js | 0 src/test/{ => html}/test_hammer_layout.css | 0 src/test/{ => html}/test_hammer_layout.html | 0 src/test/{ => html}/test_hammer_layout.js | 0 src/test/{ => html}/test_image_getter.js | 0 src/test/{ => html}/test_inline_boxes.html | 0 src/test/{ => html}/test_linking.css | 0 src/test/{ => html}/test_timeout.html | 0 src/test/{ => html}/test_timeout.js | 0 src/test/{ => html}/tiny_test.html | 0 71 files changed, 4 insertions(+), 4 deletions(-) rename src/{components => test/harness}/contenttest/contenttest.rs (100%) rename src/{components => test/harness}/reftest/rasterize.py (100%) rename src/{components => test/harness}/reftest/reftest.rs (100%) rename src/test/{ => html}/about-mozilla.html (100%) rename src/test/{ => html}/acid1.html (100%) rename src/test/{ => html}/combining-character-sequences.html (100%) rename src/test/{ => html}/content/harness.js (100%) rename src/test/{ => html}/content/test_prototypes.html (100%) rename src/test/{ => html}/content/test_prototypes.js (100%) rename src/test/{ => html}/demo.css (100%) rename src/test/{ => html}/demo.html (100%) rename src/test/{ => html}/head_link_test.html (100%) rename src/test/{ => html}/hello.html (100%) rename src/test/{ => html}/ligatures.html (100%) rename src/test/{ => html}/lipsum.html (100%) rename src/test/{ => html}/lots_of_background_colors.css (100%) rename src/test/{ => html}/mojira.html (100%) rename src/test/{ => html}/ref/blank.html (100%) rename src/test/{ => html}/ref/boxes.png (100%) rename src/test/{ => html}/ref/compute_height_width.html (100%) rename src/test/{ => html}/ref/height_compute.css (100%) rename src/test/{ => html}/ref/height_compute.html (100%) rename src/test/{ => html}/ref/height_compute_reset.css (100%) rename src/test/{ => html}/ref/height_compute_reset.html (100%) rename src/test/{ => html}/ref/height_width.css (100%) rename src/test/{ => html}/ref/reset.css (100%) rename src/test/{ => html}/ref/simple-reset.css (100%) rename src/test/{ => html}/ref/square.css (100%) rename src/test/{ => html}/ref/square.html (100%) rename src/test/{ => html}/ref/test-image.html (100%) rename src/test/{ => html}/small-layout-test.html (100%) rename src/test/{ => html}/small_color_test.css (100%) rename src/test/{ => html}/small_color_test.html (100%) rename src/test/{ => html}/test-absolute.css (100%) rename src/test/{ => html}/test-absolute.html (100%) rename src/test/{ => html}/test-alert.js (100%) rename src/test/{ => html}/test-border.css (100%) rename src/test/{ => html}/test-border.html (100%) rename src/test/{ => html}/test-inline.html (100%) rename src/test/{ => html}/test-js-alert.html (100%) rename src/test/{ => html}/test-js-image.html (100%) rename src/test/{ => html}/test-js.html (100%) rename src/test/{ => html}/test-many-images-different.html (100%) rename src/test/{ => html}/test-many-images.html (100%) rename src/test/{ => html}/test-text-break.html (100%) rename src/test/{ => html}/test-text.html (100%) rename src/test/{ => html}/test.css (100%) rename src/test/{ => html}/test.html (100%) rename src/test/{ => html}/test.jpeg (100%) rename src/test/{ => html}/test.js (100%) rename src/test/{ => html}/test_bg_color.html (100%) rename src/test/{ => html}/test_bg_color_simple.css (100%) rename src/test/{ => html}/test_bg_color_simple.html (100%) rename src/test/{ => html}/test_bindings.html (100%) rename src/test/{ => html}/test_bindings.js (100%) rename src/test/{ => html}/test_close.html (100%) rename src/test/{ => html}/test_close.js (100%) rename src/test/{ => html}/test_docelem.js (100%) rename src/test/{ => html}/test_getter_time.html (100%) rename src/test/{ => html}/test_getter_time.js (100%) rename src/test/{ => html}/test_hammer_layout.css (100%) rename src/test/{ => html}/test_hammer_layout.html (100%) rename src/test/{ => html}/test_hammer_layout.js (100%) rename src/test/{ => html}/test_image_getter.js (100%) rename src/test/{ => html}/test_inline_boxes.html (100%) rename src/test/{ => html}/test_linking.css (100%) rename src/test/{ => html}/test_timeout.html (100%) rename src/test/{ => html}/test_timeout.js (100%) rename src/test/{ => html}/tiny_test.html (100%) 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 similarity index 100% rename from src/components/contenttest/contenttest.rs rename to src/test/harness/contenttest/contenttest.rs diff --git a/src/components/reftest/rasterize.py b/src/test/harness/reftest/rasterize.py similarity index 100% rename from src/components/reftest/rasterize.py rename to src/test/harness/reftest/rasterize.py diff --git a/src/components/reftest/reftest.rs b/src/test/harness/reftest/reftest.rs similarity index 100% rename from src/components/reftest/reftest.rs rename to src/test/harness/reftest/reftest.rs diff --git a/src/test/about-mozilla.html b/src/test/html/about-mozilla.html similarity index 100% rename from src/test/about-mozilla.html rename to src/test/html/about-mozilla.html diff --git a/src/test/acid1.html b/src/test/html/acid1.html similarity index 100% rename from src/test/acid1.html rename to src/test/html/acid1.html diff --git a/src/test/combining-character-sequences.html b/src/test/html/combining-character-sequences.html similarity index 100% rename from src/test/combining-character-sequences.html rename to src/test/html/combining-character-sequences.html diff --git a/src/test/content/harness.js b/src/test/html/content/harness.js similarity index 100% rename from src/test/content/harness.js rename to src/test/html/content/harness.js diff --git a/src/test/content/test_prototypes.html b/src/test/html/content/test_prototypes.html similarity index 100% rename from src/test/content/test_prototypes.html rename to src/test/html/content/test_prototypes.html diff --git a/src/test/content/test_prototypes.js b/src/test/html/content/test_prototypes.js similarity index 100% rename from src/test/content/test_prototypes.js rename to src/test/html/content/test_prototypes.js diff --git a/src/test/demo.css b/src/test/html/demo.css similarity index 100% rename from src/test/demo.css rename to src/test/html/demo.css diff --git a/src/test/demo.html b/src/test/html/demo.html similarity index 100% rename from src/test/demo.html rename to src/test/html/demo.html diff --git a/src/test/head_link_test.html b/src/test/html/head_link_test.html similarity index 100% rename from src/test/head_link_test.html rename to src/test/html/head_link_test.html diff --git a/src/test/hello.html b/src/test/html/hello.html similarity index 100% rename from src/test/hello.html rename to src/test/html/hello.html diff --git a/src/test/ligatures.html b/src/test/html/ligatures.html similarity index 100% rename from src/test/ligatures.html rename to src/test/html/ligatures.html diff --git a/src/test/lipsum.html b/src/test/html/lipsum.html similarity index 100% rename from src/test/lipsum.html rename to src/test/html/lipsum.html diff --git a/src/test/lots_of_background_colors.css b/src/test/html/lots_of_background_colors.css similarity index 100% rename from src/test/lots_of_background_colors.css rename to src/test/html/lots_of_background_colors.css diff --git a/src/test/mojira.html b/src/test/html/mojira.html similarity index 100% rename from src/test/mojira.html rename to src/test/html/mojira.html diff --git a/src/test/ref/blank.html b/src/test/html/ref/blank.html similarity index 100% rename from src/test/ref/blank.html rename to src/test/html/ref/blank.html diff --git a/src/test/ref/boxes.png b/src/test/html/ref/boxes.png similarity index 100% rename from src/test/ref/boxes.png rename to 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 similarity index 100% rename from src/test/ref/compute_height_width.html rename to 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 similarity index 100% rename from src/test/ref/height_compute.css rename to src/test/html/ref/height_compute.css diff --git a/src/test/ref/height_compute.html b/src/test/html/ref/height_compute.html similarity index 100% rename from src/test/ref/height_compute.html rename to 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 similarity index 100% rename from src/test/ref/height_compute_reset.css rename to 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 similarity index 100% rename from src/test/ref/height_compute_reset.html rename to 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 similarity index 100% rename from src/test/ref/height_width.css rename to src/test/html/ref/height_width.css diff --git a/src/test/ref/reset.css b/src/test/html/ref/reset.css similarity index 100% rename from src/test/ref/reset.css rename to src/test/html/ref/reset.css diff --git a/src/test/ref/simple-reset.css b/src/test/html/ref/simple-reset.css similarity index 100% rename from src/test/ref/simple-reset.css rename to src/test/html/ref/simple-reset.css diff --git a/src/test/ref/square.css b/src/test/html/ref/square.css similarity index 100% rename from src/test/ref/square.css rename to src/test/html/ref/square.css diff --git a/src/test/ref/square.html b/src/test/html/ref/square.html similarity index 100% rename from src/test/ref/square.html rename to src/test/html/ref/square.html diff --git a/src/test/ref/test-image.html b/src/test/html/ref/test-image.html similarity index 100% rename from src/test/ref/test-image.html rename to src/test/html/ref/test-image.html diff --git a/src/test/small-layout-test.html b/src/test/html/small-layout-test.html similarity index 100% rename from src/test/small-layout-test.html rename to src/test/html/small-layout-test.html diff --git a/src/test/small_color_test.css b/src/test/html/small_color_test.css similarity index 100% rename from src/test/small_color_test.css rename to src/test/html/small_color_test.css diff --git a/src/test/small_color_test.html b/src/test/html/small_color_test.html similarity index 100% rename from src/test/small_color_test.html rename to src/test/html/small_color_test.html diff --git a/src/test/test-absolute.css b/src/test/html/test-absolute.css similarity index 100% rename from src/test/test-absolute.css rename to src/test/html/test-absolute.css diff --git a/src/test/test-absolute.html b/src/test/html/test-absolute.html similarity index 100% rename from src/test/test-absolute.html rename to src/test/html/test-absolute.html diff --git a/src/test/test-alert.js b/src/test/html/test-alert.js similarity index 100% rename from src/test/test-alert.js rename to src/test/html/test-alert.js diff --git a/src/test/test-border.css b/src/test/html/test-border.css similarity index 100% rename from src/test/test-border.css rename to src/test/html/test-border.css diff --git a/src/test/test-border.html b/src/test/html/test-border.html similarity index 100% rename from src/test/test-border.html rename to src/test/html/test-border.html diff --git a/src/test/test-inline.html b/src/test/html/test-inline.html similarity index 100% rename from src/test/test-inline.html rename to src/test/html/test-inline.html diff --git a/src/test/test-js-alert.html b/src/test/html/test-js-alert.html similarity index 100% rename from src/test/test-js-alert.html rename to src/test/html/test-js-alert.html diff --git a/src/test/test-js-image.html b/src/test/html/test-js-image.html similarity index 100% rename from src/test/test-js-image.html rename to src/test/html/test-js-image.html diff --git a/src/test/test-js.html b/src/test/html/test-js.html similarity index 100% rename from src/test/test-js.html rename to 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 similarity index 100% rename from src/test/test-many-images-different.html rename to 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 similarity index 100% rename from src/test/test-many-images.html rename to src/test/html/test-many-images.html diff --git a/src/test/test-text-break.html b/src/test/html/test-text-break.html similarity index 100% rename from src/test/test-text-break.html rename to src/test/html/test-text-break.html diff --git a/src/test/test-text.html b/src/test/html/test-text.html similarity index 100% rename from src/test/test-text.html rename to src/test/html/test-text.html diff --git a/src/test/test.css b/src/test/html/test.css similarity index 100% rename from src/test/test.css rename to src/test/html/test.css diff --git a/src/test/test.html b/src/test/html/test.html similarity index 100% rename from src/test/test.html rename to src/test/html/test.html diff --git a/src/test/test.jpeg b/src/test/html/test.jpeg similarity index 100% rename from src/test/test.jpeg rename to src/test/html/test.jpeg diff --git a/src/test/test.js b/src/test/html/test.js similarity index 100% rename from src/test/test.js rename to src/test/html/test.js diff --git a/src/test/test_bg_color.html b/src/test/html/test_bg_color.html similarity index 100% rename from src/test/test_bg_color.html rename to 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 similarity index 100% rename from src/test/test_bg_color_simple.css rename to 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 similarity index 100% rename from src/test/test_bg_color_simple.html rename to src/test/html/test_bg_color_simple.html diff --git a/src/test/test_bindings.html b/src/test/html/test_bindings.html similarity index 100% rename from src/test/test_bindings.html rename to src/test/html/test_bindings.html diff --git a/src/test/test_bindings.js b/src/test/html/test_bindings.js similarity index 100% rename from src/test/test_bindings.js rename to src/test/html/test_bindings.js diff --git a/src/test/test_close.html b/src/test/html/test_close.html similarity index 100% rename from src/test/test_close.html rename to src/test/html/test_close.html diff --git a/src/test/test_close.js b/src/test/html/test_close.js similarity index 100% rename from src/test/test_close.js rename to src/test/html/test_close.js diff --git a/src/test/test_docelem.js b/src/test/html/test_docelem.js similarity index 100% rename from src/test/test_docelem.js rename to src/test/html/test_docelem.js diff --git a/src/test/test_getter_time.html b/src/test/html/test_getter_time.html similarity index 100% rename from src/test/test_getter_time.html rename to src/test/html/test_getter_time.html diff --git a/src/test/test_getter_time.js b/src/test/html/test_getter_time.js similarity index 100% rename from src/test/test_getter_time.js rename to src/test/html/test_getter_time.js diff --git a/src/test/test_hammer_layout.css b/src/test/html/test_hammer_layout.css similarity index 100% rename from src/test/test_hammer_layout.css rename to src/test/html/test_hammer_layout.css diff --git a/src/test/test_hammer_layout.html b/src/test/html/test_hammer_layout.html similarity index 100% rename from src/test/test_hammer_layout.html rename to src/test/html/test_hammer_layout.html diff --git a/src/test/test_hammer_layout.js b/src/test/html/test_hammer_layout.js similarity index 100% rename from src/test/test_hammer_layout.js rename to src/test/html/test_hammer_layout.js diff --git a/src/test/test_image_getter.js b/src/test/html/test_image_getter.js similarity index 100% rename from src/test/test_image_getter.js rename to src/test/html/test_image_getter.js diff --git a/src/test/test_inline_boxes.html b/src/test/html/test_inline_boxes.html similarity index 100% rename from src/test/test_inline_boxes.html rename to src/test/html/test_inline_boxes.html diff --git a/src/test/test_linking.css b/src/test/html/test_linking.css similarity index 100% rename from src/test/test_linking.css rename to src/test/html/test_linking.css diff --git a/src/test/test_timeout.html b/src/test/html/test_timeout.html similarity index 100% rename from src/test/test_timeout.html rename to src/test/html/test_timeout.html diff --git a/src/test/test_timeout.js b/src/test/html/test_timeout.js similarity index 100% rename from src/test/test_timeout.js rename to src/test/html/test_timeout.js diff --git a/src/test/tiny_test.html b/src/test/html/tiny_test.html similarity index 100% rename from src/test/tiny_test.html rename to src/test/html/tiny_test.html