diff options
| author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-04-27 12:07:43 +0000 |
|---|---|---|
| committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-04-27 12:07:43 +0000 |
| commit | ee3ea93fbaa1e7a1ef09b4b4cc45c67d89c0f738 (patch) | |
| tree | 107b6299c92cefc50928b8f86f737aa087f177a9 /test | |
| parent | b575b934d80216969543535b0a05ffaab8ea030b (diff) | |
| download | ruby-ee3ea93fbaa1e7a1ef09b4b4cc45c67d89c0f738.tar.gz | |
Send the backtrace of the circular require warning as a single String to Warning.warn
* load.c: send as a single string.
* error.c: expose the string formatted by rb_warning as rb_warning_string().
* test/ruby/test_exception.rb: update tests.
[ruby-core:80850] [Bug #13505]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_exception.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index e53569c158..db13db76d6 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -1005,9 +1005,9 @@ $stderr = $stdout; raise "\x82\xa0"') do |outs, errs, status| $LOAD_PATH.pop $LOADED_FEATURES.delete(t) end + assert_equal(1, warning.size) assert_match(/circular require/, warning.first) - warning.pop while %r[lib/rubygems/core_ext/kernel_require.rb:] =~ warning.last - assert_operator(warning.last, :start_with?, "\tfrom #{path}:1:") + assert_match(/^\tfrom #{Regexp.escape(path)}:1:/, warning.first) end def test_undefined_backtrace |