diff options
| author | Jack Moffitt <jack@metajack.im> | 2013-10-22 10:07:38 -0600 |
|---|---|---|
| committer | Jack Moffitt <jack@metajack.im> | 2013-10-22 10:07:38 -0600 |
| commit | 2558c723c9444dd4957a3131d7e68b56495b32ea (patch) | |
| tree | c0f9307660adbc23308ea41505f0cf922fcd4af4 | |
| parent | 641fa2d9688069c3ab9f4e638f7c78a043851ac5 (diff) | |
| download | servo-2558c723c9444dd4957a3131d7e68b56495b32ea.tar.gz servo-2558c723c9444dd4957a3131d7e68b56495b32ea.zip | |
Disable contenttest on linux because it doesn't work anyway.
| -rw-r--r-- | mk/check.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/mk/check.mk b/mk/check.mk index adf8b468ce0..a6fd855f0c9 100644 --- a/mk/check.mk +++ b/mk/check.mk @@ -56,6 +56,7 @@ check-test: @$(call E, check:) @$(call E, " $(DEPS_CHECK_TARGETS_ALL)") +ifeq ($(CFG_OSTYPE),apple-darwin) .PHONY: check check: $(DEPS_CHECK_TARGETS_FAST) check-servo check-content tidy @$(call E, check: all) @@ -63,6 +64,15 @@ check: $(DEPS_CHECK_TARGETS_FAST) check-servo check-content tidy .PHONY: check-all check-all: $(DEPS_CHECK_TARGETS_ALL) check-servo check-content tidy @$(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 check-servo: $(foreach lib_crate,$(SERVO_LIB_CRATES),check-servo-$(lib_crate)) servo-test @@ -77,7 +87,7 @@ check-ref: reftest .PHONY: check-content check-content: contenttest @$(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 tidy: |