diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-15 13:08:45 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-15 13:08:45 +0000 |
| commit | 78d4bc9294cb9193e3dfe7dbb15bf01ca8bc0137 (patch) | |
| tree | 3b233a68082a74120110b4b932a189596f842b0c | |
| parent | 5df321fb1dfdfc032d882f7e160279512c8078b8 (diff) | |
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
| -rw-r--r-- | defs/gmake.mk | 9 | ||||
| -rwxr-xr-x | sample/test.rb | 2 |
2 files changed, 5 insertions, 6 deletions
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 diff --git a/sample/test.rb b/sample/test.rb index b4aa12b784..14f4d4a0f1 100755 --- a/sample/test.rb +++ b/sample/test.rb @@ -105,7 +105,7 @@ def test_check(what) unless $ntest.zero? PROGRESS.finish end - STDERR.print "basictest/test.rb:#{what} " + STDERR.print "sample/test.rb:#{what} " PROGRESS.init $what = what $testnum = 0 |