diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/test_rubyoptions.rb | 7 | ||||
| -rw-r--r-- | vm_dump.c | 16 |
3 files changed, 2 insertions, 27 deletions
@@ -1150,12 +1150,6 @@ Fri Nov 30 17:43:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_str_cmp_m): return fixed value, one of -1,0,+1 always. -Fri Nov 30 16:19:14 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm_dump.c (rb_vm_bugreport): get rid of calling methods in sigsegv - handler. based on a patch by charliesome (Charlie Somerville) - [ruby-core:49573] [Bug #7402] - Fri Nov 30 16:05:44 2012 Eric Hodel <drbrain@segment7.net> * NEWS: Added RubyGems 2.0.0 diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 9e8978fd05..16656f0b24 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -508,13 +508,6 @@ class TestRubyOptions < Test::Unit::TestCase )x, nil, opts) - - bug7402 = '[ruby-core:49573]' - status = assert_in_out_err(['-e', 'class Bogus; def to_str; exit true; end; end', - '-e', '$".unshift Bogus.new', - '-e', 'Process.kill :SEGV, $$'], - "", //, /#<Bogus:/) - assert_not_predicate(status, :success?, "segv but success #{bug7402}") end def test_DATA @@ -675,26 +675,14 @@ rb_vm_bugreport(void) if (vm) { int i; VALUE name; - long len; - const int max_name_length = 1024; -# define LIMITED_NAME_LENGTH(s) \ - (((len = RSTRING_LEN(s)) > max_name_length) ? max_name_length : (int)len) name = vm->progname; - fprintf(stderr, "* Loaded script: %.*s\n", - LIMITED_NAME_LENGTH(name), RSTRING_PTR(name)); + fprintf(stderr, "* Loaded script: %s\n", StringValueCStr(name)); fprintf(stderr, "\n"); fprintf(stderr, "* Loaded features:\n\n"); for (i=0; i<RARRAY_LEN(vm->loaded_features); i++) { name = RARRAY_PTR(vm->loaded_features)[i]; - if (RB_TYPE_P(name, T_STRING)) { - fprintf(stderr, " %4d %.*s\n", i, - LIMITED_NAME_LENGTH(name), RSTRING_PTR(name)); - } - else { - fprintf(stderr, " %4d #<%s:%p>\n", i, - rb_class2name(CLASS_OF(name)), (void *)name); - } + fprintf(stderr, " %4d %s\n", i, StringValueCStr(name)); } fprintf(stderr, "\n"); } |