archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 19:14:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 33517:

Browse source 
------------------------------------------------------------------------
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
This commit is contained in:
naruse 2012-02-09 21:13:27 +00:00
parent 4bfa061e52
commit 513b0988f0
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/rubygems/test_gem_ext_configure_builder.rb
View file

@ -46,13 +46,13 @@ class TestGemExtConfigureBuilder < Gem::TestCase
end end
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=" sh_prefix_configure = "sh ./configure --prefix="
expected = %r(configure failed: expected = %r(configure failed:
#{Regexp.escape sh_prefix_configure}#{Regexp.escape @dest_path} #{Regexp.escape sh_prefix_configure}#{Regexp.escape @dest_path}
.*?: #{shell_error_msg} (?:.*?: )?#{shell_error_msg}
) )
assert_match expected, error.message assert_match expected, error.message

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 79 #define RUBY_PATCHLEVEL 80
#define RUBY_RELEASE_DATE "2012-02-10" #define RUBY_RELEASE_DATE "2012-02-10"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012