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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Dec 28, 2008 · 3dd5483 · 3dd5483
1 parent 524ec32
commit 3dd5483
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -46,7 +46,7 @@ def test_self_build_fail
       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: