From 9ddc0996e34bac6fbc8b8bdc8e116d40c2a2d9be Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 15 Jan 2009 16:32:41 +0000
Subject: merges r21535 from trunk into ruby_1_9_1. * common.mk: btest-ruby
 should receive option with OPTS.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 4 ++++
 common.mk | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ee25c59e5..99ae273fc 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 ef749880a..6598a4443 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
-- 
cgit