diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-10 03:20:47 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-10 03:20:47 +0000 |
commit | 1b7b47010a73b8ecaebf28ca2ad5a2dbe73ad0d2 (patch) | |
tree | 5638680aab19ab955bc4ff94229f2b9952a0c54f | |
parent | 53c0a52d7d3bbd1e2ad1ff3f0e6d9f59cfb9f08f (diff) |
merge revision(s) 44916: [Backport #10043]
error.c: Crash Report log
* error.c (REPORTBUG_MSG): mention about Crash Report log file on
MacOS X.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | error.c | 7 | ||||
-rw-r--r-- | test/ruby/test_rubyoptions.rb | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -41,12 +41,17 @@ extern const char ruby_description[]; -#define REPORTBUG_MSG \ +static const char REPORTBUG_MSG[] = "[NOTE]\n" \ "You may have encountered a bug in the Ruby interpreter" \ " or extension libraries.\n" \ "Bug reports are welcome.\n" \ + "" +#if defined __APPLE__ + "Don't forget to include the above Crash Report log file.\n" +#endif "For details: http://www.ruby-lang.org/bugreport.html\n\n" \ + ; static const char * rb_strerrno(int err) diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index e84002c9c9..63d69b3e8d 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -502,7 +502,8 @@ class TestRubyOptions < Test::Unit::TestCase \[NOTE\]\n You\smay\shave\sencountered\sa\sbug\sin\sthe\sRuby\sinterpreter\sor\sextension\slibraries.\n Bug\sreports\sare\swelcome.\n - For\sdetails:\shttp:\/\/www.ruby-lang.org/bugreport.html\n + (?:.*\n)? + For\sdetails:\shttp:\/\/.*\.ruby-lang\.org/.*\n \n (?:#{additional}) \z @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-09-10" -#define RUBY_PATCHLEVEL 560 +#define RUBY_PATCHLEVEL 561 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 9 |