From 6b40b69b961a2b2c53389bc2649ed13e9f76012e Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 15 Jan 2016 04:39:35 +0000
Subject: gmake.mk: update order

* defs/gmake.mk (yes-test-basic): update the target name and the
  order of tests.  [Feature #11982]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53540 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 defs/gmake.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'defs')

diff --git a/defs/gmake.mk b/defs/gmake.mk
index 439ca9b6f0..b5acb48576 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -41,12 +41,13 @@ $(foreach arch,$(filter -arch=%,$(subst -arch ,-arch=,$(ARCH_FLAG))),\
 endif
 
 ifneq ($(filter $(CHECK_TARGETS) test,$(MAKECMDGOALS)),)
+yes-test-basic: $(TEST_DEPENDS) yes-test-knownbug
 yes-test-knownbug: $(TEST_DEPENDS) yes-btest-ruby
-yes-btest-ruby: $(TEST_DEPENDS) yes-test-sample
-yes-test-sample: $(TEST_DEPENDS)
+yes-btest-ruby: $(TEST_DEPENDS)
 endif
-ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) $(filter test-all,$(TEST_TARGETS)),)
-yes-test-testframework yes-test-almost yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS))
+ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) $(filter yes-test-all,$(TEST_TARGETS)),)
+yes-test-testframework yes-test-almost yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS)) \
+	yes-test-basic
 endif
 ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),)
 yes-test-testframework yes-test-almost yes-test-ruby: yes-test-knownbug
-- 
cgit v1.2.3