From 283b316bc7be16c8e52e12a95687ee202b4bb857 Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Tue, 26 Aug 2014 17:23:26 -0700 Subject: [PATCH] Run the same tests for make check on all platforms This target is no longer run in automation; it's for developer convenience, so it should really run everything. Also ensure that `check-all` is a superset of `check`. --- mk/check.mk | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/mk/check.mk b/mk/check.mk index 1632ca1d5ff..e57ae21ee09 100644 --- a/mk/check.mk +++ b/mk/check.mk @@ -54,29 +54,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