summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-20 03:01:49 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-20 03:01:49 +0000
commitb6064b59eb95d5124a9b89154686f6ee3f711159 (patch)
tree7488be148eb3483b590e518ba401cc4be090e2ce
parentd41506934b414110b9cb1fb2d14be05d86a0b1da (diff)
downloadruby-b6064b59eb95d5124a9b89154686f6ee3f711159.tar.gz
ruby-b6064b59eb95d5124a9b89154686f6ee3f711159.tar.xz
ruby-b6064b59eb95d5124a9b89154686f6ee3f711159.zip
* 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. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/drb/test_drb.rb4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1cba2fe57..d1b28fb8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 20 11:59:33 2007 Tanaka Akira <akr@fsij.org>
+
+ * 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 <m_seki@mva.biglobe.ne.jp>
* lib/drb/extservm.rb: merged from ruby_1_8 branch.
diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb
index 5719f60b8..1aecf74e4 100644
--- a/test/drb/test_drb.rb
+++ b/test/drb/test_drb.rb
@@ -113,7 +113,7 @@ class TestDRbYield < Test::Unit::TestCase
end
end
-class TestRubyYield < TestDRbYield
+class TestDRbRubyYield < TestDRbYield
def echo_yield(*arg)
yield(*arg)
end
@@ -145,7 +145,7 @@ class TestRubyYield < TestDRbYield
end
end
-class TestRuby18Yield < TestRubyYield
+class TestDRbRuby18Yield < TestDRbRubyYield
class YieldTest18
def echo_yield(*arg, &proc)
proc.call(*arg)