diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/test_rubyoptions.rb | 4 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Sun Oct 24 00:25:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * test/ruby/test_rubyoptions.rb (test_segv_test): follow up the + change at r29556. + Sat Oct 23 14:39:58 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb: $extmk should be true for test/runner. diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 82ff0258e7..169f12f590 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -378,9 +378,8 @@ class TestRubyOptions < Test::Unit::TestCase %r(\A -e:(?:1:)?\s\[BUG\]\sSegmentation\sfault\n #{ Regexp.quote(RUBY_DESCRIPTION) }\n\n - --\scontrol\sframe\s----------\n + --\sControl\sframe\sinformation\s-+\n (?:c:.*\n)* - ---------------------------\n (?: --\sRuby\slevel\sbacktrace\sinformation\s----------------------------------------\n -e:1:in\s\`<main>\'\n @@ -391,6 +390,7 @@ class TestRubyOptions < Test::Unit::TestCase --\sC\slevel\sbacktrace\sinformation\s-------------------------------------------\n (?:(?:.*\s)?\[0x\h+\]\n)*\n )? + (?m:.*) \[NOTE\]\n You\smay\shave\sencountered\sa\sbug\sin\sthe\sRuby\sinterpreter\sor\sextension\slibraries.\n Bug\sreports\sare\swelcome.\n @@ -1,11 +1,11 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_RELEASE_DATE "2010-10-23" +#define RUBY_RELEASE_DATE "2010-10-24" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 23 +#define RUBY_RELEASE_DAY 24 #include "ruby/version.h" |