[DRE-commits] [ruby-oj] 01/01: Also remove Build-Depends: ruby-railties as I intended to

[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 ruby-oj.

commit ebd8b6b40b3afd874c5d801074b83ccc9024011b
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Tue Sep 8 15:31:02 2015 +0000

    Also remove Build-Depends: ruby-railties as I intended to
---
 debian/changelog     |  7 +++++++
 debian/control       |  1 -
 debian/ruby-tests.rb | 12 ++++++++++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 29d6de0..88344b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-oj (2.12.10-3) unstable; urgency=medium
+
+  * Team upload.
+  * Also remove Build-Depends: ruby-railties as I intended to.
+
+ -- Christian Hofstaedtler <zeha at debian.org>  Tue, 08 Sep 2015 15:30:16 +0000
+
 ruby-oj (2.12.10-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index c91014c..5ad14a3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Cédric Boutillier <boutil at debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
                gem2deb (>= 0.5~),
                ruby-minitest (>= 5.0~),
-               ruby-railties,
                ruby-sqlite3
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-oj.git
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index b9baf99..bbaf9fe 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -1,12 +1,20 @@
 ENV['TZ']="Europe/Paris"
+SKIPPED_TESTS = [
+  './test/./test_serializer.rb',
+  './test/isolated/test_mimic_rails_before.rb',
+  './test/isolated/test_mimic_rails_after.rb'
+]
 
 success=true
 Dir.glob("./test/{isolated,.}/test*.rb").each do |f|
   # we'd like to not have rails in Build-Depends, but this means we can't test the rails integration.
-  next if f == './test/./test_serializer.rb'
+  next if SKIPPED_TESTS.include?(f)
   puts "-------- running #{f} test ------- "
   #system("TZ='Europe/Paris' #{ENV['RUBY_TEST_BIN']} -I#{ENV['RUBYLIB']} #{f}") or success=false
-  system("#{ENV['RUBY_TEST_BIN']} -I#{ENV['RUBYLIB']} #{f}") or success=false
+  system("#{ENV['RUBY_TEST_BIN']} -I#{ENV['RUBYLIB']} #{f}") or begin
+    puts "E: Test #{f} has failed."
+    success=false
+  end
 end
 
 exit(1) unless(success)

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