Skip to content

Commit

Permalink
* test/drb/test_drb.rb: rename TestRubyYield to TestDRbRubyYield to
Browse files Browse the repository at this point in the history
  avoid name crash with test/ruby/test_yield.rb.
  TestRuby18Yield is renamed to TestDRbRuby18Yield too.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
akr committed Nov 20, 2007
1 parent 6591e38 commit ee1029c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Tue Nov 20 11:59:33 2007 Tanaka Akira <[email protected]>

* test/drb/test_drb.rb: rename TestRubyYield to TestDRbRubyYield to
avoid name crash with test/ruby/test_yield.rb.
TestRuby18Yield is renamed to TestDRbRuby18Yield too.

Tue Nov 20 03:24:42 2007 Masatoshi SEKI <[email protected]>

* lib/drb/extservm.rb: merged from ruby_1_8 branch.
Expand Down
4 changes: 2 additions & 2 deletions test/drb/test_drb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def test_06_taint
end
end

class TestRubyYield < TestDRbYield
class TestDRbRubyYield < TestDRbYield
def echo_yield(*arg)
yield(*arg)
end
Expand Down Expand Up @@ -145,7 +145,7 @@ def teardown
end
end

class TestRuby18Yield < TestRubyYield
class TestDRbRuby18Yield < TestDRbRubyYield
class YieldTest18
def echo_yield(*arg, &proc)
proc.call(*arg)
Expand Down

0 comments on commit ee1029c

Please sign in to comment.