[DRE-commits] [ruby-redcarpet] 01/01: call redcarpet using the right Ruby in test suite

[Antonio Terceiro]

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

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

commit 5f152acb8eb398db69b34afdbeb34504d3024831
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Oct 30 09:31:54 2015 -0200

    call redcarpet using the right Ruby in test suite
    
    Closes: #797101
---
 debian/changelog                         | 10 ++++++++--
 debian/patches/call-the-right-ruby.patch | 22 ++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0df7878..186c1c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
-ruby-redcarpet (3.3.2-1) UNRELEASED; urgency=medium
+ruby-redcarpet (3.3.2-1) unstable; urgency=medium
 
+  [ Pirate Praveen ]
   * Team upload.
   * New upstream release.
   * Remove patch 0001-Remove-RubyGems-Depends.patch (already applied).
 
- -- Pirate Praveen <praveen at debian.org>  Fri, 28 Aug 2015 00:56:00 +0530
+  [ Antonio Terceiro ]
+  * debian/patches/call-the-right-ruby.patch: while testing the redcarpet
+    binary, call it using the Ruby interpreter currently being used for tests
+    (Closes: #797101)
+
+ -- Antonio Terceiro <terceiro at debian.org>  Fri, 30 Oct 2015 09:31:06 -0200
 
 ruby-redcarpet (3.2.3-1) unstable; urgency=medium
 
diff --git a/debian/patches/call-the-right-ruby.patch b/debian/patches/call-the-right-ruby.patch
new file mode 100644
index 0000000..03b69ef
--- /dev/null
+++ b/debian/patches/call-the-right-ruby.patch
@@ -0,0 +1,22 @@
+Description: Call the right Ruby in tests
+ This is probably Debian-specific as upstream does not care about this type of thing.
+Author: Antonio Terceiro <terceiro at debian.org>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=797101
+Forwarded: not-needed
+Last-Update: 2015-10-30
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/test/redcarpet_bin_test.rb
++++ b/test/redcarpet_bin_test.rb
+@@ -64,8 +64,9 @@ class RedcarpetBinTest < Redcarpet::Test
+ 
+   def run_bin(*args)
+     bin_path = File.expand_path('../../bin/redcarpet', __FILE__)
++    ruby = RbConfig::CONFIG['ruby_install_name']
+ 
+-    IO.popen("#{bin_path} #{args.join(" ")}") do |stream|
++    IO.popen("#{ruby} #{bin_path} #{args.join(" ")}") do |stream|
+       @output = stream.read
+     end
+   end
diff --git a/debian/patches/series b/debian/patches/series
index 669fb9a..ab7a8dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_test_no_rewind_into_previous_inline.patch
+call-the-right-ruby.patch

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