aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-05 15:14:33 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-05 15:14:33 +0000
commitdf334f5277548bb71877224f26531dba388b9805 (patch)
tree14aceb35ad156eff238493831228ec5e52e10d1f
parent642562c707d3e53104f4088417761b783c744db5 (diff)
downloadruby-df334f5277548bb71877224f26531dba388b9805.tar.gz
* lib/test/unit.rb (Test::Unit::Options#non_options): options[:ruby]
should be an array. This fixes "./ruby test/runner.rb test/testunit/test_parallel.rb" [ruby-dev:44782] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--lib/test/unit.rb2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8069fe2220..a9ff0d6023 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Nov 6 00:11:52 2011 Tanaka Akira <akr@fsij.org>
+
+ * lib/test/unit.rb (Test::Unit::Options#non_options): options[:ruby]
+ should be an array. This fixes
+ "./ruby test/runner.rb test/testunit/test_parallel.rb"
+ [ruby-dev:44782]
+
Sat Nov 5 20:30:30 2011 Martin Duerst <duerst@it.aoyama.ac.jp>
* insns.def: Some fixes and tweaks to English explanations
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 8d3a726b9b..651ba0a939 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -116,7 +116,7 @@ module Test
warn "#{caller(1)[0]}: warning: Parallel running disabled because can't get path to ruby; run specify with --ruby argument"
options[:parallel] = nil
else
- options[:ruby] ||= RbConfig.ruby
+ options[:ruby] ||= [RbConfig.ruby]
end
true