summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-28 09:43:12 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-28 09:43:12 +0000
commitb40b5bfa9bb7ff70ffcef46b2d9670280ea0f483 (patch)
tree01b4bcb89f9a254a4dff916fdb9bfcda8cd62584
parent5d3687e3bfa12e61434086baa0d7634cbc9d3c92 (diff)
downloadruby-b40b5bfa9bb7ff70ffcef46b2d9670280ea0f483.tar.gz
ruby-b40b5bfa9bb7ff70ffcef46b2d9670280ea0f483.tar.xz
ruby-b40b5bfa9bb7ff70ffcef46b2d9670280ea0f483.zip
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
-rw-r--r--ChangeLog5
-rw-r--r--test/rubygems/test_gem_ext_configure_builder.rb2
2 files changed, 6 insertions, 1 deletions
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 <naruse@ruby-lang.org>
+
+ * 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 <mame@tsg.ne.jp>
* 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: