diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-30 01:24:05 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-30 01:24:05 +0000 |
| commit | a8f87d6d8d04d34ead8915ae350999c7875180ea (patch) | |
| tree | 586cc013033faa5251906036ca79ab8db03c1b21 /common.mk | |
| parent | 99c741c119e46ae4f12f68095ca6f9f1d6d2b58d (diff) | |
common test options
* common.mk (btest, test-sample, test-knownbugs, test-all, test-ruby):
pass common options by TESTOPTS.
* tool/rubytest.rb: pass ARGV from make to sample/test.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -474,37 +474,37 @@ check-ruby: test test-ruby btest: $(TEST_RUNNABLE)-btest no-btest: PHONY yes-btest: miniruby$(EXEEXT) PHONY - $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY)" $(OPTS) + $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY)" $(OPTS) $(TESTOPTS) btest-ruby: $(TEST_RUNNABLE)-btest-ruby no-btest-ruby: PHONY yes-btest-ruby: prog PHONY - $(Q)$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q $(OPTS) + $(Q)$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q $(OPTS) $(TESTOPTS) test-sample: $(TEST_RUNNABLE)-test-sample no-test-sample: PHONY yes-test-sample: prog PHONY - $(Q)$(RUNRUBY) $(srcdir)/tool/rubytest.rb + $(Q)$(RUNRUBY) $(srcdir)/tool/rubytest.rb $(OPTS) $(TESTOPTS) test-knownbugs: test-knownbug test-knownbug: $(TEST_RUNNABLE)-test-knownbug no-test-knownbug: PHONY yes-test-knownbug: prog PHONY - -$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb + -$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(TESTOPTS) $(srcdir)/KNOWNBUGS.rb test: test-sample btest-ruby test-knownbug test-all: $(TEST_RUNNABLE)-test-all yes-test-all: prog PHONY - $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTS) + $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) $(TESTS) TESTS_BUILD = mkmf no-test-all: PHONY - $(MINIRUBY) -I"$(srcdir)/lib" "$(srcdir)/test/runner.rb" $(TESTS_BUILD) + $(MINIRUBY) -I"$(srcdir)/lib" "$(srcdir)/test/runner.rb" $(TESTOPTS) $(TESTS_BUILD) test-ruby: $(TEST_RUNNABLE)-test-ruby no-test-ruby: PHONY yes-test-ruby: prog encs PHONY - $(RUNRUBY) "$(srcdir)/test/runner.rb" -q $(TESTS) ruby + $(RUNRUBY) "$(srcdir)/test/runner.rb" -q $(TESTOPTS) $(TESTS) ruby extconf: $(PREP) $(Q) $(MAKEDIRS) "$(EXTCONFDIR)" |