summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-17 02:50:22 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-17 02:50:22 +0000
commit68262a2048d3253b279d990acdd403cdeaf5a83b (patch)
treea8270b0399ab0fee59064d3f7af4f14c2db5514c
parent7d0066c542628b0d356de76617ac980292c1c583 (diff)
* common.mk (btest, btest-ruby, test-sample test-knownbugs)
(test-all, test-ruby): depend on prog. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk20
2 files changed, 15 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 046387f151d..7e6d050fee8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 17 11:50:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (btest, btest-ruby, test-sample test-knownbugs)
+ (test-all, test-ruby): depend on prog.
+
Fri Feb 17 09:56:22 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (create_header): log the content of header.
diff --git a/common.mk b/common.mk
index 1bf5299e119..cef94ffbd57 100644
--- a/common.mk
+++ b/common.mk
@@ -463,31 +463,31 @@ check: test test-all
$(ECHO) check succeeded
check-ruby: test test-ruby
-btest: miniruby$(EXEEXT) $(TEST_RUNNABLE)-btest
+btest: $(TEST_RUNNABLE)-btest
no-btest: PHONY
-yes-btest: PHONY
+yes-btest: miniruby$(EXEEXT) PHONY
$(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)" $(OPTS)
-btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) $(TEST_RUNNABLE)-btest-ruby
+btest-ruby: $(TEST_RUNNABLE)-btest-ruby
no-btest-ruby: PHONY
-yes-btest-ruby: PHONY
+yes-btest-ruby: prog PHONY
@$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q $(OPTS)
-test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) $(TEST_RUNNABLE)-test-sample
+test-sample: $(TEST_RUNNABLE)-test-sample
no-test-sample: PHONY
-yes-test-sample: PHONY
+yes-test-sample: prog PHONY
@$(RUNRUBY) $(srcdir)/tool/rubytest.rb
test-knownbugs: test-knownbug
-test-knownbug: miniruby$(EXEEXT) $(PROGRAM) $(RBCONFIG) $(TEST_RUNNABLE)-test-knownbug
+test-knownbug: $(TEST_RUNNABLE)-test-knownbug
no-test-knownbug: PHONY
-yes-test-knownbug: PHONY
+yes-test-knownbug: prog PHONY
-$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb
test: test-sample btest-ruby test-knownbug
test-all: $(TEST_RUNNABLE)-test-all
-yes-test-all: PHONY
+yes-test-all: prog PHONY
$(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTS)
TESTS_BUILD = mkmf
no-test-all: PHONY
@@ -495,7 +495,7 @@ no-test-all: PHONY
test-ruby: $(TEST_RUNNABLE)-test-ruby
no-test-ruby: PHONY
-yes-test-ruby: PHONY
+yes-test-ruby: prog PHONY
$(RUNRUBY) "$(srcdir)/test/runner.rb" -q $(TESTS) ruby
extconf: $(PREP)