[DRE-commits] [rake] 04/06: Update bash-completion install directory

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository rake.

commit 9ca5b2c29919b07a5b03d742f9efef8439bcd9ea
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Fri Jul 31 08:39:58 2015 +0200

    Update bash-completion install directory
---
 bin/rake                | 6 ------
 debian/rake.install     | 2 +-
 test/helper.rb          | 9 +++++++--
 test/test_rake_clean.rb | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/bin/rake b/bin/rake
index 4e0bbb7..f1ac568 100755
--- a/bin/rake
+++ b/bin/rake
@@ -22,12 +22,6 @@
 # IN THE SOFTWARE.
 #++
 
-begin
-  require 'rubygems'
-  gem 'rake'
-rescue LoadError
-end
-
 require 'rake'
 
 Rake.application.run
diff --git a/debian/rake.install b/debian/rake.install
index 43b345d..943a102 100644
--- a/debian/rake.install
+++ b/debian/rake.install
@@ -1 +1 @@
-debian/bash_completion.d/rake etc/bash_completion.d/
+debian/bash_completion.d/rake usr/share/bash-completion/completions/
diff --git a/test/helper.rb b/test/helper.rb
index 2ff599e..45392a5 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -50,8 +50,13 @@ class Rake::TestCase < Minitest::Test
     @verbose = ENV['VERBOSE']
 
     @rake_exec = File.join @rake_root, 'bin', 'rake'
-    @rake_lib  = File.join @rake_root, 'lib'
-    @ruby_options = ["-I#{@rake_lib}", "-I."]
+    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
 
     @orig_pwd = Dir.pwd
     @orig_appdata      = ENV['APPDATA']
diff --git a/test/test_rake_clean.rb b/test/test_rake_clean.rb
index 0bce7bc..fad2a48 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 test_cleanup
+  def skip_under_fakeroot__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