diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-23 15:28:04 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-23 15:28:04 +0000 |
commit | 54956f6bd1c42500d1cf427a98f6d35cacbae83d (patch) | |
tree | 48b2b99f65e4c4bf3611e38198e691c2df6a17e0 /test | |
parent | 1ae16961956c2459c0f29b676c5da9cb9cc875bf (diff) |
add tag v1_8_7_299v1_8_7_299
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_8_7_299@28412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/optparse/test_summary.rb | 6 | ||||
-rw-r--r-- | test/ruby/test_marshal.rb | 28 |
2 files changed, 2 insertions, 32 deletions
diff --git a/test/optparse/test_summary.rb b/test/optparse/test_summary.rb index 12744a8a7b..bd533e6444 100644 --- a/test/optparse/test_summary.rb +++ b/test/optparse/test_summary.rb @@ -1,8 +1,6 @@ -require 'test/unit' -require 'optparse' +require 'test_optparse' -class TestOptionParser < Test::Unit::TestCase; end -class TestOptionParser::SummaryTest < Test::Unit::TestCase +class TestOptionParser::SummaryTest < TestOptionParser def test_short_clash r = nil o = OptionParser.new do |opts| diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index d40c9da4d4..5ae521e4f6 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -72,34 +72,6 @@ class TestMarshal < Test::Unit::TestCase assert_equal("marshal data too short", e.message) end - class DumpTest - def marshal_dump - loop { Thread.pass } - end - end - - class LoadTest - def marshal_dump - nil - end - def marshal_load(obj) - loop { Thread.pass } - end - end - - def test_context_switch - o = DumpTest.new - Thread.new { Marshal.dump(o) } - GC.start - assert(true, '[ruby-dev:39425]') - - o = LoadTest.new - m = Marshal.dump(o) - Thread.new { Marshal.load(m) } - GC.start - assert(true, '[ruby-dev:39425]') - end - def test_taint x = Object.new x.taint |