aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--test/ruby/test_thread.rb1
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b4a545aa1..5483ca0f72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 13 23:15:58 2008 Shugo Maeda <shugo@ruby-lang.org>
+
+ * test/ruby/test_thread.rb (test_list): call Thread.pass to run t1.
+ fixed [ruby-core:18264].
+
Wed Aug 13 23:05:51 2008 TAKAO Kouji <kouji@takao7.net>
* string.c (alias_func): changed to 'weak, alias' from 'alias' for
@@ -9,7 +14,7 @@ Wed Aug 13 19:40:12 2008 Koichi Sasada <ko1@atdot.net>
Wed Aug 13 18:34:22 2008 Shugo Maeda <shugo@ruby-lang.org>
- * marshal.c (marshal_load): set arg.untrust properly.
+ * marshal.c (marshal_load): set arg.untrust properly.
Wed Aug 13 17:47:09 2008 Tanaka Akira <akr@fsij.org>
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb
index 046eaec7bf..043917f2ec 100644
--- a/test/ruby/test_thread.rb
+++ b/test/ruby/test_thread.rb
@@ -225,6 +225,7 @@ class TestThread < Test::Unit::TestCase
def test_list
assert_in_out_err([], <<-INPUT) do |r, e|
t1 = Thread.new { sleep }
+ Thread.pass
t2 = Thread.new { loop { } }
t3 = Thread.new { }.join
p [Thread.current, t1, t2].sort_by {|t| t.object_id }