naruse	2012-02-10 06:13:27 +0900 (Fri, 10 Feb 2012)

  New Revision: 34531

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34531

  Log:
    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"".
    ------------------------------------------------------------------------

  Modified files:
    branches/ruby_1_9_3/test/rubygems/test_gem_ext_configure_builder.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34530)
+++ ruby_1_9_3/version.h	(revision 34531)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 79
+#define RUBY_PATCHLEVEL 80
 
 #define RUBY_RELEASE_DATE "2012-02-10"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/rubygems/test_gem_ext_configure_builder.rb
===================================================================
--- ruby_1_9_3/test/rubygems/test_gem_ext_configure_builder.rb	(revision 34530)
+++ ruby_1_9_3/test/rubygems/test_gem_ext_configure_builder.rb	(revision 34531)
@@ -46,13 +46,13 @@
       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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/