[前][次][番号順一覧][スレッド一覧]

ruby-changes:21468

From: naruse <ko1@a...>
Date: Mon, 24 Oct 2011 15:42:06 +0900 (JST)
Subject: [ruby-changes:21468] naruse:r33517 (trunk): Follow the error format changed by FreeBSD 9.

naruse	2011-10-24 15:41:57 +0900 (Mon, 24 Oct 2011)

  New Revision: 33517

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

  Log:
    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:
    trunk/test/rubygems/test_gem_ext_configure_builder.rb

Index: test/rubygems/test_gem_ext_configure_builder.rb
===================================================================
--- test/rubygems/test_gem_ext_configure_builder.rb	(revision 33516)
+++ test/rubygems/test_gem_ext_configure_builder.rb	(revision 33517)
@@ -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/

[前][次][番号順一覧][スレッド一覧]