summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-20 02:13:00 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-20 02:13:00 +0000
commitce34147cf4de2212b77d11d83a8e4cbd9df52683 (patch)
tree4f4aa8517faf83ce673555faa15b74d6332eff59 /common.mk
parent1a36dbe3ba91c7254169f67f0142680eb05aeaa8 (diff)
* configure.in, Makefile.in (TEST_RUNNABLE): tests are not
runnable if cross-compiling. * common.mk (btest*, test*): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk20
1 files changed, 15 insertions, 5 deletions
diff --git a/common.mk b/common.mk
index e4fbfe01f1..458810d747 100644
--- a/common.mk
+++ b/common.mk
@@ -389,21 +389,31 @@ clean-enc distclean-enc realclean-enc:
check: test test-all
-btest: miniruby$(EXEEXT) PHONY
+btest: miniruby$(EXEEXT) $(TEST_RUNNABLE)-btest
+no-btest: PHONY
+yes-btest: PHONY
$(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)" $(OPTS)
-btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
+btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) $(TEST_RUNNABLE)-btest-ruby
+no-btest-ruby: PHONY
+yes-btest-ruby: PHONY
@$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q $(OPTS)
-test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
+test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) $(TEST_RUNNABLE)-test-sample
+no-test-sample: PHONY
+yes-test-sample: PHONY
@$(RUNRUBY) $(srcdir)/tool/rubytest.rb
-test-knownbug: miniruby$(EXEEXT) $(PROGRAM) $(RBCONFIG) PHONY
+test-knownbug: miniruby$(EXEEXT) $(PROGRAM) $(RBCONFIG) $(TEST_RUNNABLE)-test-knownbug
+no-test-knownbug: PHONY
+yes-test-knownbug: PHONY
$(MINIRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb
test: test-sample btest-ruby test-knownbug
-test-all:
+test-all: $(TEST_RUNNABLE)-test-all
+no-test-all: PHONY
+yes-test-all: PHONY
$(RUNRUBY) "$(srcdir)/test/runner.rb" $(TESTS)
extconf: $(PREP)