[DRE-commits] [ruby-mysql2] 06/07: call debian/start_mysqld_and_run.sh from debian/ruby-tests.rake

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-mysql2.

commit f673712eaba1ae600fdf44f2ea5a4e497e24b7cc
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Feb 24 19:12:55 2016 -0300

    call debian/start_mysqld_and_run.sh from debian/ruby-tests.rake
---
 debian/changelog       |  2 ++
 debian/ruby-tests.rake | 10 ++++++----
 debian/rules           |  6 ------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 08ffcaf..16e41d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ruby-mysql2 (0.4.3-1) UNRELEASED; urgency=medium
   * rename debian/start_mysqld_and_auto_install.sh to
     debian/start_mysqld_and_run.sh and make it generic; adapt all in
     debian/rules accordingly.
+  * Move logic for calling debian/start_mysqld_and_run.sh for running the
+    tests inside debian/ruby-tests.rake
 
  -- Christian Hofstaedtler <zeha at debian.org>  Tue, 02 Feb 2016 19:04:34 -0200
 
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 986006f..c787bfa 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,7 +1,9 @@
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern      = './spec/mysql2/**/*_spec.rb'
-end
+task :default do
+  sh 'cp spec/configuration.yml.example spec/configuration.yml'
+  sh 'cp spec/my.cnf.example spec/my.cnf'
 
-task :default => :spec
+  ruby = RbConfig::CONFIG['ruby_install_name']
+  sh "./debian/start_mysqld_and_run.sh #{ruby} -S rspec"
+end
diff --git a/debian/rules b/debian/rules
index c9a0398..a5e7dc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,3 @@
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
-
-# need to start an mysqld instance to run the tests
-override_dh_auto_install:
-	cp spec/configuration.yml.example spec/configuration.yml
-	cp spec/my.cnf.example spec/my.cnf
-	debian/start_mysqld_and_run.sh dh_auto_install

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