From cf8149733f03cc71889b6e730201149ce471f4e1 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 15 Jan 2016 13:08:45 +0000 Subject: Revert r53539 and r53540 * basictest/test.rb: revert r53539 because it depends on r53537. * gmake.mk: ditto, revert r53540. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53544 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- defs/gmake.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'defs') diff --git a/defs/gmake.mk b/defs/gmake.mk index b5acb48576..439ca9b6f0 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -41,13 +41,12 @@ $(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-btest-ruby: $(TEST_DEPENDS) yes-test-sample +yes-test-sample: $(TEST_DEPENDS) endif -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 +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)) 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