[DRE-commits] [gem2deb] 01/04: Revert attempt to avoid output to stderr

[Antonio Terceiro]

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

terceiro pushed a commit to branch autopkgtest
in repository gem2deb.

commit d513ba0a94a5a67f4aae9cc0de4e265615881a82
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Aug 24 10:12:12 2014 -0300

    Revert attempt to avoid output to stderr
    
    Instead, just redirect stderr to stdout in the test commands. stderr
    output is useful, and test failures should be reported via a non-zero
    exit code anyway.
---
 debian/changelog                                       | 3 ---
 lib/gem2deb/dh_make_ruby/template/debian/tests/control | 2 +-
 lib/gem2deb/test_runner.rb                             | 4 +---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 188693f..35a3054 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,6 @@ gem2deb (0.9.0) UNRELEASED; urgency=medium
     + add templates for debian/tests files and XS-Testsuite: autopkgtest field
       to debian/control template
   * Make dh-make-ruby idempotent
-  * Disable output to sterr when running autopkgtest
-    +  disable warning with -W0 when calling ruby for tests
-    +  do not make FileUtils verbose
   * Refactor test_suite creation in dh_make_ruby
 
  -- Cédric Boutillier <boutil at debian.org>  Thu, 21 Aug 2014 22:33:08 +0200
diff --git a/lib/gem2deb/dh_make_ruby/template/debian/tests/control b/lib/gem2deb/dh_make_ruby/template/debian/tests/control
index e60ba6d..9413bf4 100644
--- a/lib/gem2deb/dh_make_ruby/template/debian/tests/control
+++ b/lib/gem2deb/dh_make_ruby/template/debian/tests/control
@@ -1,4 +1,4 @@
-Test-Command: gem2deb-test-runner --autopkgtest
+Test-Command: gem2deb-test-runner --autopkgtest 2>&1
 Depends: @, @builddeps@, gem2deb-test-runner
 
 #FIXME: replace LIB by the name of the main file of the library
diff --git a/lib/gem2deb/test_runner.rb b/lib/gem2deb/test_runner.rb
index 08db54c..00eab84 100644
--- a/lib/gem2deb/test_runner.rb
+++ b/lib/gem2deb/test_runner.rb
@@ -19,7 +19,7 @@ require 'fileutils'
 module Gem2Deb
   class TestRunner
 
-    include FileUtils
+    include FileUtils::Verbose
 
     attr_accessor :autopkgtest
 
@@ -67,8 +67,6 @@ module Gem2Deb
 
     def run_ruby(*cmd)
       rubylib = load_path.join(':')
-      # disable warning when running autopkgtest
-      cmd.unshift("-W0") if autopkgtest
       cmd.unshift(rubyver)
       if $VERBOSE
         print "RUBYLIB=#{rubylib} "

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