From df334f5277548bb71877224f26531dba388b9805 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 5 Nov 2011 15:14:33 +0000 Subject: [PATCH] * 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 --- ChangeLog | 7 +++++++ lib/test/unit.rb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) 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 + + * 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 * 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