[DRE-commits] [rake] 02/06: Undo direct modification of upstream files

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository rake.

commit 15257e4e295a7052e380cdae600fe634ad33cd84
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Feb 29 16:52:05 2016 -0300

    Undo direct modification of upstream files
---
 bin/rake                | 6 ++++++
 test/helper.rb          | 9 ++-------
 test/test_rake_clean.rb | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/bin/rake b/bin/rake
index f1ac568..4e0bbb7 100755
--- a/bin/rake
+++ b/bin/rake
@@ -22,6 +22,12 @@
 # IN THE SOFTWARE.
 #++
 
+begin
+  require 'rubygems'
+  gem 'rake'
+rescue LoadError
+end
+
 require 'rake'
 
 Rake.application.run
diff --git a/test/helper.rb b/test/helper.rb
index b530dc2..ac1205a 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -49,13 +49,8 @@ class Rake::TestCase < Minitest::Test
     @verbose = ENV['VERBOSE']
 
     @rake_exec = File.join @rake_root, 'bin', 'rake'
-    if ENV['ADTTMP']
-      @rake_lib  = '/usr/lib/ruby/vendor_ruby'
-      @ruby_options = []
-    else
-      @rake_lib  = File.join @rake_root, 'lib'
-      @ruby_options = ["-I#{@rake_lib}", "-I."]
-    end
+    @rake_lib  = File.join @rake_root, 'lib'
+    @ruby_options = ["-I#{@rake_lib}", "-I."]
 
     @orig_pwd = Dir.pwd
     @orig_appdata      = ENV['APPDATA']
diff --git a/test/test_rake_clean.rb b/test/test_rake_clean.rb
index fad2a48..0bce7bc 100644
--- a/test/test_rake_clean.rb
+++ b/test/test_rake_clean.rb
@@ -11,7 +11,7 @@ class TestRakeClean < Rake::TestCase
       "Clobber should require clean"
   end
 
-  def skip_under_fakeroot__test_cleanup
+  def test_cleanup
     file_name = create_undeletable_file
 
     out, _ = capture_io do

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rake.git