From 6361928083d01906ab9d8782b6533b4ed7c834a0 Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 15 Jul 2014 03:07:37 +0000
Subject: * lib/rake.rb, lib/rake/*.rb: Upgrade to rake-10.3.2   [fix GH-668] *
 test/rake/*.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/rake/test_rake_functional.rb | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'test/rake/test_rake_functional.rb')

diff --git a/test/rake/test_rake_functional.rb b/test/rake/test_rake_functional.rb
index f2ce2f78f0..bf7ba92f75 100644
--- a/test/rake/test_rake_functional.rb
+++ b/test/rake/test_rake_functional.rb
@@ -268,6 +268,14 @@ class TestRakeFunctional < Rake::TestCase
     assert_match(/^FIRST$\s+^DYNAMIC$\s+^STATIC$\s+^OTHER$/, @out)
   end
 
+  def test_regenerate_imports
+    rakefile_regenerate_imports
+
+    rake
+
+    assert_match(/^INITIAL\s+^REGENERATED$/, @out)
+  end
+
   def test_rules_chaining_to_file_task
     rakefile_chains
 
@@ -368,6 +376,14 @@ class TestRakeFunctional < Rake::TestCase
     assert_match(/^PREPARE\nSCOPEDEP$/m, @out)
   end
 
+  def test_test_task_descriptions
+    rakefile_test_task
+
+    rake "-T"
+
+    assert_match(/custom test task description/, @out)
+  end
+
   def test_comment_before_task_acts_like_desc
     rakefile_comments
 
@@ -414,7 +430,7 @@ class TestRakeFunctional < Rake::TestCase
   end
 
   def can_detect_signals?
-    system "ruby -e 'Process.kill \"TERM\", $$'"
+    system RUBY, '-e', 'Process.kill "TERM", $$'
     status = $?
     if @verbose
       puts "    SIG status = #{$?.inspect}"
-- 
cgit v1.2.3