[DRE-commits] [ruby-eventmachine] 02/02: switched tests from debian/ruby-tests.rb to 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-eventmachine.

commit 1b1058c89c88f45ccb7eef7e5d63cca8dee38020
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Jul 21 10:48:18 2015 -0300

    switched tests from debian/ruby-tests.rb to debian/ruby-tests.rake
---
 debian/changelog       |  1 +
 debian/ruby-tests.rake | 15 +++++++++++++++
 debian/ruby-tests.rb   | 12 ------------
 debian/rules           |  5 +++++
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 66154aa..8a2268c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-eventmachine (1.0.7-3) unstable; urgency=medium
 
   * Team upload.
   * Update packaging with a new dh-make-ruby run
+    - switched tests from debian/ruby-tests.rb to debian/ruby-tests.rake
 
  -- Antonio Terceiro <terceiro at debian.org>  Mon, 20 Jul 2015 21:19:07 -0300
 
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 100644
index 0000000..4535d7b
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1,15 @@
+require 'gem2deb/rake/testtask'
+
+disabled_tests= [
+  'tests/test_idle_connection.rb',
+  'tests/test_get_sock_opt.rb',
+  'tests/test_set_sock_opt.rb',
+]
+
+ENV['TESTOPTS'] = '-v'
+
+Gem2Deb::Rake::TestTask.new do |t|
+  t.libs = ['tests']
+  t.test_files = FileList['tests/**/test_*.rb'] - disabled_tests
+  t.verbose = true
+end
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
deleted file mode 100644
index 5d20516..0000000
--- a/debian/ruby-tests.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-$: << 'tests' 
-
-# some tests requiring network access
-disabled_tests=[
-  'tests/test_idle_connection.rb',
-  'tests/test_get_sock_opt.rb',
-  'tests/test_set_sock_opt.rb',
-]
-
-
-
-(Dir['{tests}/**/*.rb']-disabled_tests).each { |f| require f }
diff --git a/debian/rules b/debian/rules
index 9964b95..80ed575 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,8 @@ export GEM2DEB_TEST_RUNNER = --check-dependencies
 
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGELOG.md
+
+override_dh_auto_install:
+	mv rakelib rakelib.off
+	dh_auto_install
+	mv rakelib.off rakelib

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