diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | common.mk | 8 | ||||
| -rwxr-xr-x | tool/rubytest.rb | 3 |
3 files changed, 16 insertions, 5 deletions
@@ -1,3 +1,13 @@ +Fri Sep 20 23:24:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk (btest, btest-ruby, test-knownbug): add $(RUN_OPTS) to + ruby to be run, so that tests are runnable before making exts. + + * common.mk (test-sample): ditto, and use $(MINIRUBY) as rubytest.rb + does not need extension libraries. + + * tool/rubytest.rb: pass $(RUN_OPTS) to testing ruby using --run-opt. + Fri Sep 20 15:01:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (intern_str): sigil only names are junk, at least one @@ -506,23 +506,23 @@ no-fake: PHONY btest: $(TEST_RUNNABLE)-btest no-btest: PHONY yes-btest: fake miniruby$(EXEEXT) PHONY - $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY)" $(OPTS) $(TESTOPTS) + $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(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) $(TESTOPTS) + $(Q)$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" -q $(OPTS) $(TESTOPTS) test-sample: $(TEST_RUNNABLE)-test-sample no-test-sample: PHONY yes-test-sample: prog PHONY - $(Q)$(RUNRUBY) $(srcdir)/tool/rubytest.rb $(OPTS) $(TESTOPTS) + $(Q)$(MINIRUBY) $(srcdir)/tool/rubytest.rb --run-opt=$(RUN_OPTS) $(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) $(TESTOPTS) $(srcdir)/KNOWNBUGS.rb + -$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(srcdir)/KNOWNBUGS.rb test: test-sample btest-ruby test-knownbug diff --git a/tool/rubytest.rb b/tool/rubytest.rb index a19ce9271a..a06c400744 100755 --- a/tool/rubytest.rb +++ b/tool/rubytest.rb @@ -11,12 +11,13 @@ unless File.exist? ruby print "Try `make' first, then `make test', please.\n" exit false end +ARGV[0] and opt = ARGV[0][/\A--run-opt=(.*)/, 1] and ARGV.shift $stderr.reopen($stdout) error = '' srcdir = File.expand_path('..', File.dirname(__FILE__)) -`#{ruby} #{srcdir}/sample/test.rb #{ARGV.join(' ')}`.each_line do |line| +`#{ruby} #{opt} #{srcdir}/sample/test.rb #{ARGV.join(' ')}`.each_line do |line| if line =~ /^end of test/ print "\ntest succeeded\n" exit true |