[DRE-commits] [jekyll] 15/17: Add 0012_no_require_relative.patch to use LOAD_PATH to find jekyll in tests

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository jekyll.

commit 38cb5365fb20923cca165121e0d769962f666e8d
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Jun 5 21:12:31 2016 +0200

    Add 0012_no_require_relative.patch to use LOAD_PATH to find jekyll in tests
---
 debian/changelog                              |  2 ++
 debian/patches/0012_no_require_relative.patch | 18 ++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0c48286..67c8acc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ jekyll (3.1.6+dfsg-1) unstable; urgency=medium
   * Add 0010-require-openssl.patch to require openssl in tests needing it
   * Add 0011-fix-test-pygments.patch to fix change of output in pygments
     (Closes: #825628)
+  * Add 0012_no_require_relative.patch to use LOAD_PATH to find jekyll in
+    tests
 
  -- Cédric Boutillier <boutil at debian.org>  Sun, 05 Jun 2016 11:33:15 +0200
 
diff --git a/debian/patches/0012_no_require_relative.patch b/debian/patches/0012_no_require_relative.patch
new file mode 100644
index 0000000..6af521c
--- /dev/null
+++ b/debian/patches/0012_no_require_relative.patch
@@ -0,0 +1,18 @@
+Description: don't use require_relative for tests
+ This lets the system find the needed library in the correct place according to
+ LOAD_PATH and should fix autopkgtests
+Author: Cédric Boutillier <boutil at debian.org>
+Forwarded: no
+Last-Update: 2016-06-05
+
+--- a/test/helper.rb
++++ b/test/helper.rb
+@@ -20,7 +20,7 @@
+ require 'minitest/autorun'
+ require 'minitest/reporters'
+ require 'rspec/mocks'
+-require_relative "../lib/jekyll.rb"
++require "jekyll"
+ 
+ Jekyll.logger = Logger.new(StringIO.new)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0e208a6..945fe0c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 0009-Remove-relative-LOAD_PATH-from-bin-jekyll.patch
 0010-require-openssl.patch
 0011-fix-test-pygments.patch
+0012_no_require_relative.patch

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