summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorsorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-22 14:16:38 +0000
committersorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-22 14:16:38 +0000
commit8f1430d08b1cba4e2a255cb48e3fa46a84d4d2e3 (patch)
tree4ba729ff03a2ad36e8058cf28bdd27c58d6f3d1b /lib
parentb7af3f6f0cf09846f90345aa134722f27714ca3f (diff)
* lib/test/unit.rb: Fix --ruby option doesn't effect.
* lib/test/unit.rb: Fix typo. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30942 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/test/unit.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index d6d2c1056a..1272153c7b 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -106,7 +106,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
@@ -493,7 +493,7 @@ module Test
report.push(*r[:report])
@errors += r[:result][0]
@failures += r[:result][1]
- @skips += r[:result][1]
+ @skips += r[:result][2]
end
end
end