diff options
| author | Lars Bergstrom <lbergstrom@mozilla.com> | 2014-08-27 10:27:02 -0500 |
|---|---|---|
| committer | Lars Bergstrom <lbergstrom@mozilla.com> | 2014-08-27 10:27:02 -0500 |
| commit | 7f8e8372e3b42d3a3ad7b7400d287b1760d32612 (patch) | |
| tree | b0d61146f7dc7042af79d8c9049d2f75d65198a6 | |
| parent | 370192451f46ab81dd07dae754280c88fc617c97 (diff) | |
| parent | 283b316bc7be16c8e52e12a95687ee202b4bb857 (diff) | |
| download | servo-7f8e8372e3b42d3a3ad7b7400d287b1760d32612.tar.gz servo-7f8e8372e3b42d3a3ad7b7400d287b1760d32612.zip | |
Merge pull request #3166 from mbrubeck/check
Run the same tests for make check on all platforms
| -rw-r--r-- | mk/check.mk | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/mk/check.mk b/mk/check.mk index e885e6e3ec3..468250f689f 100644 --- a/mk/check.mk +++ b/mk/check.mk @@ -57,29 +57,20 @@ contenttest: $(S)src/test/harness/contenttest/contenttest.rs servo DEPS_CHECK_TESTABLE = $(filter-out $(NO_TESTS),$(DEPS_CHECK_ALL)) DEPS_CHECK_TARGETS_ALL = $(addprefix check-,$(DEPS_CHECK_TESTABLE)) DEPS_CHECK_TARGETS_FAST = $(addprefix check-,$(filter-out $(SLOW_TESTS),$(DEPS_CHECK_TESTABLE))) +DEPS_CHECK_TARGETS_ADDITIONAL = check-servo check-wpt check-content check-ref tidy .PHONY: check-test 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-wpt check-content check-ref tidy +check: $(DEPS_CHECK_TARGETS_FAST) $(DEPS_CHECK_TARGETS_ADDITIONAL) @$(call E, check: all) .PHONY: check-all -check-all: $(DEPS_CHECK_TARGETS_ALL) check-servo check-content check-ref tidy +check-all: $(DEPS_CHECK_TARGETS_ALL) $(DEPS_CHECK_TARGETS_ADDITIONAL) @$(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 |