kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* test/rake/helper.rb: Load envutil correctly. Removed useless rescue

Browse source 
for signal propagation tests
* lib/rake/file_utils.rb:  Prefer the built ruby.
* test/rake/test_rake_functional.rb:  ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38232 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2012-12-06 07:35:45 +00:00
parent 854758c464
commit 9b76b5057c
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu Dec 6 16:35:21 2012 Eric Hodel <drbrain@segment7.net>
* test/rake/helper.rb: Load envutil correctly. Removed useless rescue
for signal propagation tests
* lib/rake/file_utils.rb: Prefer the built ruby.
* test/rake/test_rake_functional.rb: ditto
Thu Dec 6 15:20:34 2012 Eric Hodel <drbrain@segment7.net> Thu Dec 6 15:20:34 2012 Eric Hodel <drbrain@segment7.net>
* lib/rdoc/context.rb: Don't warn for duplicate methods while loading. * lib/rdoc/context.rb: Don't warn for duplicate methods while loading.

2
lib/rake/file_utils.rb
View file

@ -6,7 +6,7 @@ require 'fileutils'
# added to the FileUtils utility functions. # added to the FileUtils utility functions.
module FileUtils module FileUtils
# Path to the currently running Ruby program # Path to the currently running Ruby program
RUBY = File.join( RUBY = ENV['RUBY'] || File.join(
RbConfig::CONFIG['bindir'], RbConfig::CONFIG['bindir'],
RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT']). RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT']).
sub(/.*\s.*/m, '"\&"') sub(/.*\s.*/m, '"\&"')

8
test/rake/helper.rb
View file

@ -12,8 +12,8 @@ require 'tmpdir'
require File.expand_path('../file_creation', __FILE__) require File.expand_path('../file_creation', __FILE__)
begin begin
require 'test/ruby/envutil' require_relative '../ruby/envutil'
rescue LoadError rescue NoMethodError, LoadError
# for ruby trunk # for ruby trunk
end end
@ -515,8 +515,8 @@ Rake::TestTask.new(:b) do |t|
end end
task :test do task :test do
Rake::Task[:a].invoke rescue nil Rake::Task[:a].invoke
Rake::Task[:b].invoke rescue nil Rake::Task[:b].invoke
end end
task :default => :test task :default => :test

2
test/rake/test_rake_functional.rb
View file

@ -471,7 +471,7 @@ class TestRakeFunctional < Rake::TestCase
def run_ruby(option_list) def run_ruby(option_list)
puts "COMMAND: [#{RUBY} #{option_list.join ' '}]" if @verbose puts "COMMAND: [#{RUBY} #{option_list.join ' '}]" if @verbose
inn, out, err, wait = Open3.popen3(Gem.ruby, *option_list) inn, out, err, wait = Open3.popen3(RUBY, *option_list)
inn.close inn.close
@out = out.read @out = out.read