Disable contenttest on linux because it doesn't work anyway.

This commit is contained in:
Jack Moffitt 2013-10-22 10:07:38 -06:00
parent 641fa2d968
commit 2558c723c9

View file

@ -56,6 +56,7 @@ check-test:
@$(call E, check:) @$(call E, check:)
@$(call E, " $(DEPS_CHECK_TARGETS_ALL)") @$(call E, " $(DEPS_CHECK_TARGETS_ALL)")
ifeq ($(CFG_OSTYPE),apple-darwin)
.PHONY: check .PHONY: check
check: $(DEPS_CHECK_TARGETS_FAST) check-servo check-content tidy check: $(DEPS_CHECK_TARGETS_FAST) check-servo check-content tidy
@$(call E, check: all) @$(call E, check: all)
@ -63,6 +64,15 @@ check: $(DEPS_CHECK_TARGETS_FAST) check-servo check-content tidy
.PHONY: check-all .PHONY: check-all
check-all: $(DEPS_CHECK_TARGETS_ALL) check-servo check-content tidy check-all: $(DEPS_CHECK_TARGETS_ALL) check-servo check-content tidy
@$(call E, check: all) @$(call E, check: all)
else
.PHONY: check
check: $(DEPS_CHECK_TARGETS_FAST) check-servo tidy
@$(call E, check: all)
.PHONY: check-all
check-all: $(DEPS_CHECK_TARGETS_ALL) check-servo tidy
@$(call E, check: all)
endif
.PHONY: check-servo .PHONY: check-servo
check-servo: $(foreach lib_crate,$(SERVO_LIB_CRATES),check-servo-$(lib_crate)) servo-test check-servo: $(foreach lib_crate,$(SERVO_LIB_CRATES),check-servo-$(lib_crate)) servo-test
@ -77,7 +87,7 @@ check-ref: reftest
.PHONY: check-content .PHONY: check-content
check-content: contenttest check-content: contenttest
@$(call E, check: contenttests) @$(call E, check: contenttests)
$(Q)RUST_TEST_TASKS=1 ./contenttest --source-dir=$(S)src/test/html/content $(TESTNAME) $(Q)./contenttest --source-dir=$(S)src/test/html/content $(TESTNAME)
.PHONY: tidy .PHONY: tidy
tidy: tidy: