diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-09 21:13:27 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-09 21:13:27 +0000 |
| commit | 513b0988f0703d7443fca2e6bc883bac23346cad (patch) | |
| tree | 048e576cf508f676fa0318d880043c264f654b27 /test | |
| parent | 4bfa061e52c723e051d172c2d85cefb92aead1d9 (diff) | |
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
Diffstat (limited to 'test')
| -rw-r--r-- | test/rubygems/test_gem_ext_configure_builder.rb | 4 |
1 files changed, 2 insertions, 2 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 |