From 5c8ab4d9c2931c0e0f1ee58e516c91f1e9a47486 Mon Sep 17 00:00:00 2001 From: drbrain Date: Mon, 30 Jun 2008 18:46:21 +0000 Subject: RubyGems patches by Yusuke ENDOH [ruby-core:17442], [ruby-core:17444]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17754 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ runruby.rb | 1 + test/rubygems/test_gem_ext_configure_builder.rb | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f53d47d034..00ddf574ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Jul 1 03:28:16 2008 Eric Hodel + + * test/rubygems/test_ext_configure_builder.rb: Apply locale-free + patch by Yusuke ENDOH. [ruby-core:17444]. + + * runruby.rb: Set ENV['rake']. Patch by Yusuke ENDOH + [ruby-core:17442]. + Tue Jul 1 01:07:17 2008 Nobuyoshi Nakada * lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside diff --git a/runruby.rb b/runruby.rb index 8b0e9c20e5..95e2906cad 100755 --- a/runruby.rb +++ b/runruby.rb @@ -46,6 +46,7 @@ libs << File.expand_path("lib", srcdir) config["bindir"] = abs_archdir ENV["RUBY"] = File.expand_path(ruby) ENV["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR) +ENV["rake"] = ENV["RUBY"] + " " + File.join(abs_archdir, "bin", "rake") if pure libs << File.expand_path("ext", srcdir) << "-" diff --git a/test/rubygems/test_gem_ext_configure_builder.rb b/test/rubygems/test_gem_ext_configure_builder.rb index 2ed273a192..aa7db475f1 100644 --- a/test/rubygems/test_gem_ext_configure_builder.rb +++ b/test/rubygems/test_gem_ext_configure_builder.rb @@ -47,9 +47,9 @@ class TestGemExtConfigureBuilder < RubyGemTestCase end end - shell_error_msg = %r{(\./configure: No such file or directory)|(Can't open \./configure)} + shell_error_msg = %r{(\./configure: .*)|(Can't open \./configure)} sh_prefix_configure = "sh ./configure --prefix=" - + expected = %r(configure failed: #{Regexp.escape sh_prefix_configure}#{Regexp.escape @dest_path} -- cgit v1.2.3