aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--bootstraptest/test_thread.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d67e2a49a..88669d2bc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 22 22:56:42 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * bootstraptest/test_thread.rb: fix test. [Bug #2342]
+
Thu Apr 22 21:50:17 2010 Keiju Ishitsuka <keiju@ruby-lang.org>
* lib/irb/ext/multi-irb.rb: fix multi-irb running
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
index a7478fcd2c..56c77259cf 100644
--- a/bootstraptest/test_thread.rb
+++ b/bootstraptest/test_thread.rb
@@ -174,9 +174,9 @@ assert_equal %q{[true, nil, true]}, %q{
$a = $~
Thread.new{
$b = $~
- /a/ =~ 'a'
+ /b/ =~ 'b'
$c = $~
- }
+ }.join
$d = $~
[$a == $d, $b, $c != $d]
}