summaryrefslogtreecommitdiff
path: root/lib/test/unit.rb
diff options
context:
space:
mode:
authorsorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-24 01:08:51 +0000
committersorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-24 01:08:51 +0000
commite9c22a6f1a0b1f7afe2ca282209015e48fef5795 (patch)
tree02b93c3e6af5db45908317d6258684989dc8b976 /lib/test/unit.rb
parent48fa6ed529d531419b54c56993730b0e2ded928c (diff)
* test/testunit/tests_for_parallel/misc.rb: Fix bug in r30947.
* lib/test/unit.rb, lib/test/unit/assertions.rb: For this test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30948 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/test/unit.rb')
-rw-r--r--lib/test/unit.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 6c4cecc442..52e67b97ac 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -32,6 +32,7 @@ module Test
module Options
def initialize(*, &block)
@init_hook = block
+ @options = nil
super(&nil)
end
@@ -232,6 +233,11 @@ module Test
alias orig_run_anything _run_anything
undef _run_anything
+ undef options
+
+ def options
+ @optss ||= (@options||{}).merge(@opts)
+ end
def _run_anything type
if @opts[:parallel] && @warnings