diff options
| -rw-r--r-- | load.c | 3 | ||||
| -rw-r--r-- | test/ruby/test_require.rb | 7 |
2 files changed, 8 insertions, 2 deletions
@@ -1007,7 +1007,6 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception) result = 0; } else if (!*ftptr) { - rb_provide_feature(path); result = TAG_RETURN; } else { @@ -1022,7 +1021,6 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception) rb_ary_push(ruby_dln_librefs, LONG2NUM(handle)); break; } - rb_provide_feature(path); result = TAG_RETURN; } } @@ -1056,6 +1054,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception) rb_exc_raise(ec->errinfo); } + if (result == TAG_RETURN) rb_provide_feature(path); ec->errinfo = errinfo; RUBY_DTRACE_HOOK(REQUIRE_RETURN, RSTRING_PTR(fname)); diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index 05dc18cd17..a86ea356c5 100644 --- a/test/ruby/test_require.rb +++ b/test/ruby/test_require.rb @@ -214,6 +214,13 @@ class TestRequire < Test::Unit::TestCase assert_syntax_error_backtrace {|req| require req} end + def test_require_syntax_error_rescued + assert_syntax_error_backtrace do |req| + assert_raise_with_message(SyntaxError, /unexpected/) {require req} + require req + end + end + def test_load_syntax_error assert_syntax_error_backtrace {|req| load req} end |