summaryrefslogtreecommitdiffstats
path: root/bootstraptest
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-19 08:02:03 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-19 08:02:03 +0000
commit0229fb841a265c8aeb74850ef355748fb149f676 (patch)
treefbe57605f0245f4a98f21a4b822fbbdc79fc69b6 /bootstraptest
parentf8ce0007091df81698a1560baf83d37ec9202408 (diff)
downloadruby-0229fb841a265c8aeb74850ef355748fb149f676.tar.gz
ruby-0229fb841a265c8aeb74850ef355748fb149f676.tar.xz
ruby-0229fb841a265c8aeb74850ef355748fb149f676.zip
* eval.c (errinfo_place): skip if error is Fixnum. [ruby-dev:32608]
* bootstraptest/test_exception.rb, test_known_bug.rb: move fixed bug. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bootstraptest')
-rw-r--r--bootstraptest/test_exception.rb17
-rw-r--r--bootstraptest/test_knownbug.rb17
2 files changed, 17 insertions, 17 deletions
diff --git a/bootstraptest/test_exception.rb b/bootstraptest/test_exception.rb
index eb2c30905..bd3d02ade 100644
--- a/bootstraptest/test_exception.rb
+++ b/bootstraptest/test_exception.rb
@@ -385,3 +385,20 @@ assert_match /undefined method `foo\'/, %q{
C.new.foo
}, "[ruby-dev:31407]"
+assert_equal 'nil', %q{
+ doit = false
+ exc = nil
+ t = Thread.new {
+ begin
+ doit = true
+ sleep 10
+ ensure
+ exc = $!
+ end
+ }
+ Thread.pass until doit
+ t.kill
+ t.join
+ exc.inspect
+}, '[ruby-dev:32608]'
+
diff --git a/bootstraptest/test_knownbug.rb b/bootstraptest/test_knownbug.rb
index 345e5c68d..c50377ac5 100644
--- a/bootstraptest/test_knownbug.rb
+++ b/bootstraptest/test_knownbug.rb
@@ -190,23 +190,6 @@ assert_normal_exit %q{
Thread.new { GC.start }.join
}, '[ruby-dev:32604]'
-assert_equal 'nil', %q{
- doit = false
- exc = nil
- t = Thread.new {
- begin
- doit = true
- sleep 10
- ensure
- exc = $!
- end
- }
- Thread.pass until doit
- t.kill
- t.join
- exc.inspect
-}, '[ruby-dev:32608]'
-
assert_equal 'true', %q{
"abc".sub(/b/, "\xa1\xa1".force_encoding("euc-jp")) ==
"a\xa1\xa1c".force_encoding("euc-jp")