- Fixed autotest --rc option handling. (simplybusiness)

[git-p4: depot-paths = "//src/ZenTest/dev/": change = 6511]

lib/autotest.rb

@@ -118,7 +118,7 @@ def self.parse_options args = ARGV
       end
 
       opts.on("-r", "--rc CONF", String, "Override path to config file") do |o|
-        options[:rc] = o
+        options[:rc] = Array(o)
       end
 
       opts.on("-s", "--style STYLE", String,

test/test_autotest.rb

@@ -24,6 +24,10 @@ class Autotest
   def self.clear_hooks
     HOOKS.clear
   end
+
+  def self.reset_options
+    @@options = {}
+  end
 end
 
 class TestAutotest < MiniTest::Unit::TestCase
@@ -465,6 +469,17 @@ def test_testlib
     assert_match @a.testlib, @a.make_test_cmd(f)
   end
 
+  def test_runner_accepts_rc_options
+    begin
+      Autotest.parse_options(['--rc', 'autotest_rc'])
+      Autotest.new
+    rescue
+      deny $!, "It should not throw #{$!.message}"
+    ensure
+      Autotest.reset_options
+    end
+  end
+
   def util_exceptions
     @a.exception_list.sort_by { |r| r.to_s }
   end