[DRE-commits] [ruby-curb] 02/04: Remove local extension dir from tests load path

[David Suárez]

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

deiv-guest pushed a commit to branch master
in repository ruby-curb.

commit e50b826fa027d5b736b2686296d215427c12e407
Author: David Suárez <david.sephirot at gmail.com>
Date:   Sat Oct 19 22:35:23 2013 +0200

    Remove local extension dir from tests load path
---
 ...e-local-extension-dir-from-tests-loadpath.patch |   24 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/remove-local-extension-dir-from-tests-loadpath.patch b/debian/patches/remove-local-extension-dir-from-tests-loadpath.patch
new file mode 100644
index 0000000..6a56008
--- /dev/null
+++ b/debian/patches/remove-local-extension-dir-from-tests-loadpath.patch
@@ -0,0 +1,24 @@
+Description: Remove local extension dir from tests load path
+ Fix test segfault due to the wrong ruby version extension gets loaded.
+ This is caused because the ext dir contains the last '.so' library builded
+ and makes his way into the test load path
+
+Author: David Suárez <david.sephirot at gmail.com>
+Bug-Debian: http://bugs.debian.org/720256
+Last-Update: 2013-10-19
+
+--- ruby-curb-0.8.5.orig/tests/helper.rb
++++ ruby-curb-0.8.5/tests/helper.rb
+@@ -4,10 +4,10 @@ $CURB_TESTING = true
+ require 'uri'
+ 
+ $TOPDIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+-$EXTDIR = File.join($TOPDIR, 'ext')
++#$EXTDIR = File.join($TOPDIR, 'ext')
+ $LIBDIR = File.join($TOPDIR, 'lib')
+ $:.unshift($LIBDIR)
+-$:.unshift($EXTDIR)
++#$:.unshift($EXTDIR)
+ 
+ require 'curb'
+ require 'test/unit'
diff --git a/debian/patches/series b/debian/patches/series
index 452175c..5f8264c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable_test_requiring_network.patch
+remove-local-extension-dir-from-tests-loadpath.patch

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