From dcedf0a008f07f38e570c70b3872fa37e837be4a Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 3 Jul 2019 14:16:36 +0900 Subject: [PATCH] Fix order of tests `check` includes `test-testframework`, `test-short` and its preceeding tests, but `test-all` does not. --- defs/gmake.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/defs/gmake.mk b/defs/gmake.mk index a23ac46704..11f95a3b35 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -12,13 +12,12 @@ TEST_DEPENDS := $(filter-out commit $(TEST_TARGETS),$(MAKECMDGOALS)) TEST_TARGETS := $(patsubst great,exam,$(TEST_TARGETS)) TEST_DEPENDS := $(filter-out great $(TEST_TARGETS),$(TEST_DEPENDS)) TEST_TARGETS := $(patsubst exam,check,$(TEST_TARGETS)) -TEST_TARGETS := $(patsubst check,test-spec test-all,$(TEST_TARGETS)) +TEST_TARGETS := $(patsubst check,test-spec test-all test-testframework test-short,$(TEST_TARGETS)) TEST_TARGETS := $(patsubst test-rubyspec,test-spec,$(TEST_TARGETS)) TEST_DEPENDS := $(filter-out exam check test-spec $(TEST_TARGETS),$(TEST_DEPENDS)) TEST_TARGETS := $(patsubst love,check,$(TEST_TARGETS)) TEST_DEPENDS := $(filter-out love $(TEST_TARGETS),$(TEST_DEPENDS)) TEST_TARGETS := $(patsubst test-almost,test-all,$(patsubst check-%,test test-%,$(TEST_TARGETS))) -TEST_TARGETS := $(patsubst test-all,test-short test-testframework test-all,$(TEST_TARGETS)) TEST_DEPENDS := $(filter-out test-all $(TEST_TARGETS),$(TEST_DEPENDS)) TEST_TARGETS := $(patsubst test,test-short,$(TEST_TARGETS)) TEST_DEPENDS := $(filter-out test $(TEST_TARGETS),$(TEST_DEPENDS))