From cdd5de7f975aca027d6e71d1cc8dae17e982b73d Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Tue, 11 Jun 2013 16:24:10 -0600 Subject: [PATCH] Disable tests for nspr and nss. --- mk/check.mk | 6 ++++-- mk/sub.mk | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mk/check.mk b/mk/check.mk index 42adc18516d..af8481aaa84 100644 --- a/mk/check.mk +++ b/mk/check.mk @@ -26,8 +26,10 @@ reftest: $(S)src/test/harness/reftest/reftest.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)) -DEPS_CHECK_TARGETS_FAST = $(addprefix check-,$(filter-out $(SLOW_TESTS),$(DEPS_CHECK_ALL))) + +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))) .PHONY: check $(DEPS_CHECK_TARGETS_ALL) diff --git a/mk/sub.mk b/mk/sub.mk index 63d3d924f71..745b5b71179 100644 --- a/mk/sub.mk +++ b/mk/sub.mk @@ -3,6 +3,12 @@ SLOW_TESTS += \ mozjs \ $(NULL) +# Tests for these submodules do not exist. +NO_TESTS += \ + nspr \ + nss \ + $(NULL) + # These submodules will not be cleaned by the `make clean-fast` target. SLOW_BUILDS += \ libcss \