From 8f1430d08b1cba4e2a255cb48e3fa46a84d4d2e3 Mon Sep 17 00:00:00 2001
From: sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 22 Feb 2011 14:16:38 +0000
Subject: [PATCH] * 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
---
 ChangeLog        | 5 +++++
 lib/test/unit.rb | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6d9446e53c..072db6ce97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 22 23:15:17 2011  Shota Fukumori (sora_h) <sorah@tubusu.net>
+
+	* lib/test/unit.rb: Fix --ruby option doesn't effect.
+	* lib/test/unit.rb: Fix typo.
+
 Tue Feb 22 21:39:28 2011  Tanaka Akira  <akr@fsij.org>
 
 	* ext/openssl/ossl_digest.c: parenthesize macro arguments.
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