[DRE-commits] [ruby-bdb] 02/12: Add patch 'remove-src-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-bdb.

commit da93f9bbeda0fb0250456c8f4ac278e0bbcbb72b
Author: David Suárez <david.sephirot at gmail.com>
Date:   Wed Mar 12 20:19:33 2014 +0100

    Add patch 'remove-src-dir-from-tests-load-path'
---
 debian/patches/remove-src-dir-from-tests-load-path | 79 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 80 insertions(+)

diff --git a/debian/patches/remove-src-dir-from-tests-load-path b/debian/patches/remove-src-dir-from-tests-load-path
new file mode 100644
index 0000000..eb54e3a
--- /dev/null
+++ b/debian/patches/remove-src-dir-from-tests-load-path
@@ -0,0 +1,79 @@
+Description: Remove src dir from tests load path
+ This fixes segfault on tests, due to the wrong dinamic library version
+ getting loaded.
+
+Author: David Suárez <david.sephirot at gmail.com>
+Last-Update: 2014-02-30
+
+--- ruby-bdb-0.6.6.orig/tests/btree.rb
++++ ruby-bdb-0.6.6/tests/btree.rb
+@@ -1,5 +1,5 @@
+ #!/usr/bin/ruby
+-$LOAD_PATH.unshift *%w{../src src tests}
++$LOAD_PATH.unshift *%w{tests}
+ require 'bdb'
+ require 'runit_'
+ 
+--- ruby-bdb-0.6.6.orig/tests/hash.rb
++++ ruby-bdb-0.6.6/tests/hash.rb
+@@ -1,5 +1,5 @@
+ #!/usr/bin/ruby
+-$LOAD_PATH.unshift *%w{../src src tests}
++$LOAD_PATH.unshift *%w{tests}
+ require 'bdb'
+ require 'runit_'
+ 
+--- ruby-bdb-0.6.6.orig/tests/lock.rb
++++ ruby-bdb-0.6.6/tests/lock.rb
+@@ -1,5 +1,5 @@
+ #!/usr/bin/ruby
+-$LOAD_PATH.unshift *%w{../src src tests}
++$LOAD_PATH.unshift *%w{tests}
+ require 'bdb'
+ require 'runit_'
+ 
+--- ruby-bdb-0.6.6.orig/tests/log.rb
++++ ruby-bdb-0.6.6/tests/log.rb
+@@ -1,5 +1,5 @@
+ #!/usr/bin/ruby
+-$LOAD_PATH.unshift *%w{../src src tests}
++$LOAD_PATH.unshift *%w{tests}
+ require 'bdb'
+ require 'runit_'
+ 
+--- ruby-bdb-0.6.6.orig/tests/marshal.rb
++++ ruby-bdb-0.6.6/tests/marshal.rb
+@@ -1,5 +1,5 @@
+ #!/usr/bin/ruby
+-$LOAD_PATH.unshift *%w{../src src tests}
++$LOAD_PATH.unshift *%w{tests}
+ require 'bdb'
+ require 'runit_'
+ 
+--- ruby-bdb-0.6.6.orig/tests/queue.rb
++++ ruby-bdb-0.6.6/tests/queue.rb
+@@ -1,5 +1,5 @@
+ #!/usr/bin/ruby
+-$LOAD_PATH.unshift *%w{../src src tests}
++$LOAD_PATH.unshift *%w{tests}
+ require 'bdb'
+ 
+ print "\nVERSION of BDB is #{BDB::VERSION}\n"
+--- ruby-bdb-0.6.6.orig/tests/recno.rb
++++ ruby-bdb-0.6.6/tests/recno.rb
+@@ -1,5 +1,5 @@
+ #!/usr/bin/ruby
+-$LOAD_PATH.unshift *%w{../src src tests}
++$LOAD_PATH.unshift *%w{tests}
+ require 'bdb'
+ require 'runit_'
+ 
+--- ruby-bdb-0.6.6.orig/tests/recnum.rb
++++ ruby-bdb-0.6.6/tests/recnum.rb
+@@ -1,5 +1,5 @@
+ #!/usr/bin/ruby
+-$LOAD_PATH.unshift(*%w{../src src tests})
++$LOAD_PATH.unshift(*%w{tests})
+ require 'bdb'
+ require 'runit_'
+ 
diff --git a/debian/patches/series b/debian/patches/series
index dfd0ad0..fc8ecf4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fail-make-test-if-tests-fail.patch
 add-support-for-libdb_version_5_and_higher.patch
 remove_constants_safely
 fix-inheritance
+remove-src-dir-from-tests-load-path

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