From 2cbb3d821c41934f080266a8b88879dbaa9ca66f Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 9 Apr 2015 06:01:27 +0000 Subject: [PATCH] skip rake dependent tests rake is not available until installation now, so skip rake dependent tests unless it can load. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rdoc/test_rdoc_task.rb | 7 +++++-- test/rubygems/test_gem_package_task.rb | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/test/rdoc/test_rdoc_task.rb b/test/rdoc/test_rdoc_task.rb index 43d458981d..610684e540 100644 --- a/test/rdoc/test_rdoc_task.rb +++ b/test/rdoc/test_rdoc_task.rb @@ -1,5 +1,8 @@ require 'rdoc/test_case' -require 'rake' +begin + require 'rake' +rescue LoadError +end class TestRDocTask < RDoc::TestCase @@ -166,5 +169,5 @@ class TestRDocTask < RDoc::TestCase assert_equal %w[-o html] << "--title" << "Test Title Option", rdoc_task.option_list end -end +end if defined?(Rake::Task) diff --git a/test/rubygems/test_gem_package_task.rb b/test/rubygems/test_gem_package_task.rb index 1526e825fe..5b83fc4e3c 100644 --- a/test/rubygems/test_gem_package_task.rb +++ b/test/rubygems/test_gem_package_task.rb @@ -1,6 +1,9 @@ require 'rubygems/test_case' require 'rubygems' -require 'rubygems/package_task' +begin + require 'rubygems/package_task' +rescue LoadError +end class TestGemPackageTask < Gem::TestCase @@ -76,5 +79,5 @@ class TestGemPackageTask < Gem::TestCase assert_equal 'pkg/nokogiri-1.5.0-java', pkg.package_dir_path end -end +end if defined?(Rake::PackageTask)