[DRE-commits] [ruby-remcached] 02/11: Move logic for calling d/start_memcached_and_run.sh for running the tests inside d/ruby-tests.rake

[Lucas Kanashiro]

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

kanashiro-guest pushed a commit to branch master
in repository ruby-remcached.

commit 58da8235cfae3403dd2159225262432564248f00
Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
Date:   Wed Mar 2 10:08:22 2016 -0300

    Move logic for calling d/start_memcached_and_run.sh for running the tests inside d/ruby-tests.rake
---
 debian/changelog       | 2 ++
 debian/ruby-tests.rake | 7 +++----
 debian/rules           | 4 ----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d0ac37..cecf687 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ruby-remcached (0.4.1-2.1) UNRELEASED; urgency=medium
   * rename debian/start_memcached_and_auto_install.sh to
     debian/start_memcached_and_run.sh and make it generic; adapt all in
     debian/rules accordingly.
+  * Move logic for calling debian/start_memcached_and_run.sh for running the
+    tests inside debian/ruby-tests.rake
 
  -- Lucas Kanashiro <kanashiro.duarte at gmail.com>  Wed, 02 Mar 2016 10:02:57 -0300
 
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 89a753d..f2ef54e 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,7 +1,6 @@
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern      = './spec/**/*_spec.rb'
+task :default do
+  ruby = RbConfig::CONFIG['ruby_install_name']
+  sh "./debian/start_memcached_and_run.sh #{ruby} -S rspec"
 end
-
-task :default => :spec
diff --git a/debian/rules b/debian/rules
index b777bda..a286f8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,3 @@
 %:
 	dh $@ --buildsystem=ruby --with ruby
 
-# need to start a memcached instance to run the tests
-override_dh_auto_install:
-	chmod +x debian/start_memcached_and_run.sh
-	debian/start_memcached_and_run.sh dh_auto_install

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