From b40b5bfa9bb7ff70ffcef46b2d9670280ea0f483 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 28 Dec 2008 09:43:12 +0000 Subject: merges r21112 from trunk into ruby_1_9_1. * test/rubygems/test_ext_configure_builder.rb (test_self_build_fail): Extends pattern for FreeBSD's error message. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/rubygems/test_gem_ext_configure_builder.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3101fe8cf..5ba5ecfb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Dec 28 17:21:36 2008 NARUSE, Yui + + * test/rubygems/test_ext_configure_builder.rb (test_self_build_fail): + Extends pattern for FreeBSD's error message. + Sun Dec 28 12:24:14 2008 Yusuke Endoh * thread.c (mutex_free, mutex_unlock): add qualifiers. diff --git a/test/rubygems/test_gem_ext_configure_builder.rb b/test/rubygems/test_gem_ext_configure_builder.rb index 837c3a192..304fc8e3f 100644 --- a/test/rubygems/test_gem_ext_configure_builder.rb +++ b/test/rubygems/test_gem_ext_configure_builder.rb @@ -46,7 +46,7 @@ class TestGemExtConfigureBuilder < RubyGemTestCase end end - shell_error_msg = %r{(\./configure: .*)|(Can't open \./configure)} + shell_error_msg = %r{(\./configure: .*)|(Can't open \./configure(?:: No such file or directory)?)} sh_prefix_configure = "sh ./configure --prefix=" expected = %r(configure failed: -- cgit