ruby-changes:41470
From: nobu <ko1@a...>
Date: Fri, 15 Jan 2016 22:08:15 +0900 (JST)
Subject: [ruby-changes:41470] nobu:r53544 (trunk): Revert r53539 and r53540
nobu 2016-01-15 22:08:45 +0900 (Fri, 15 Jan 2016) New Revision: 53544 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53544 Log: Revert r53539 and r53540 * basictest/test.rb: revert r53539 because it depends on r53537. * gmake.mk: ditto, revert r53540. Modified files: trunk/defs/gmake.mk trunk/sample/test.rb Index: sample/test.rb =================================================================== --- sample/test.rb (revision 53543) +++ sample/test.rb (revision 53544) @@ -105,7 +105,7 @@ def test_check(what) https://github.com/ruby/ruby/blob/trunk/sample/test.rb#L105 unless $ntest.zero? PROGRESS.finish end - STDERR.print "basictest/test.rb:#{what} " + STDERR.print "sample/test.rb:#{what} " PROGRESS.init $what = what $testnum = 0 Index: defs/gmake.mk =================================================================== --- defs/gmake.mk (revision 53543) +++ defs/gmake.mk (revision 53544) @@ -41,13 +41,12 @@ $(foreach arch,$(filter -arch=%,$(subst https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L41 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/