summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 16:32:41 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 16:32:41 +0000
commit5c65dc7ae6f594fdd8431f9e34942c220c65ecd1 (patch)
treee315b72af8a2814f09207546dc6a4e2a47ecd5fb
parentf6edc70d56f72232bee465d0699d36af2c85192d (diff)
merges r21535 from trunk into ruby_1_9_1.
* common.mk: btest-ruby should receive option with OPTS. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--common.mk2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ee25c59e5e..99ae273fc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 16 00:25:09 2009 Koichi Sasada <ko1@atdot.net>
+
+ * common.mk: btest-ruby should receive option with OPTS.
+
Fri Jan 16 00:21:10 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
diff --git a/common.mk b/common.mk
index ef749880ae..6598a44431 100644
--- a/common.mk
+++ b/common.mk
@@ -367,7 +367,7 @@ btest: miniruby$(EXEEXT) PHONY
$(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)" $(OPTS)
btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
- @$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q
+ @$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q $(OPTS)
test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
@$(MINIRUBY) $(srcdir)/rubytest.rb