diff options
| -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 |