From 513b0988f0703d7443fca2e6bc883bac23346cad Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 9 Feb 2012 21:13:27 +0000 Subject: [PATCH] merge revision(s) 33517: ------------------------------------------------------------------------ r33517 | naruse | 2011-10-24 15:41:57 +0900 (Mon, 24 Oct 2011) | 6 lines Follow the error format changed by FreeBSD 9. FreeBSD 8.2's last line is "./configure: Can't open ./configure: No such file or directory\n"" but FreeBSD 9's is "cannot open ./configure: No such file or directory\n"". ------------------------------------------------------------------------ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rubygems/test_gem_ext_configure_builder.rb | 4 ++-- version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/rubygems/test_gem_ext_configure_builder.rb b/test/rubygems/test_gem_ext_configure_builder.rb index 443d4b06b5..65d31f61af 100644 --- a/test/rubygems/test_gem_ext_configure_builder.rb +++ b/test/rubygems/test_gem_ext_configure_builder.rb @@ -46,13 +46,13 @@ class TestGemExtConfigureBuilder < Gem::TestCase end end - shell_error_msg = %r{(\./configure: .*)|(Can't open \./configure(?:: No such file or directory)?)} + shell_error_msg = %r{(\./configure: .*)|((?:Can't|cannot) open \./configure(?:: No such file or directory)?)} sh_prefix_configure = "sh ./configure --prefix=" expected = %r(configure failed: #{Regexp.escape sh_prefix_configure}#{Regexp.escape @dest_path} -.*?: #{shell_error_msg} +(?:.*?: )?#{shell_error_msg} ) assert_match expected, error.message diff --git a/version.h b/version.h index 0876879f78..ba4d7a03b5 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 79 +#define RUBY_PATCHLEVEL 80 #define RUBY_RELEASE_DATE "2012-02-10" #define RUBY_RELEASE_YEAR 2012