[DRE-commits] [jekyll] 11/12: Update test: exclude test_convertible.rb

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository jekyll.

commit 7b1257a671a702474cd9136bbe9019f3b7db9231
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun Dec 27 23:42:55 2015 +0900

    Update test: exclude test_convertible.rb
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/README.Debian                              |  4 ++--
 debian/patches/0009-Force-Encoding_external.patch | 19 -------------------
 debian/patches/series                             |  1 -
 debian/ruby-tests.rake                            |  2 +-
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 311f437..ef20056 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -6,8 +6,8 @@ This README provides information for Package Maintainers.
 For Package Maintainers
 -----------------------
 
-* Some tests are disabled because can't handling relative path in
-  sbuild|pbulder. If you want to execute all tests, please check
+* Some tests are disabled because can't handling relative path and encoding
+  in sbuild|pbulder. If you want to execute all tests, please check
   debian/ruby-tests.rake'.
 
 * Unminified versions of respond.js, html5shiv.js, and normalize.css are
diff --git a/debian/patches/0009-Force-Encoding_external.patch b/debian/patches/0009-Force-Encoding_external.patch
deleted file mode 100644
index b4006f5..0000000
--- a/debian/patches/0009-Force-Encoding_external.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Debian Ruby Extras Maintainers
- <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Date: Sun, 27 Dec 2015 22:14:32 +0900
-Subject: Force Encoding_external
-
-Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
----
- test/test_convertible.rb | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/test_convertible.rb b/test/test_convertible.rb
-index 09c6973..783d05b 100644
---- a/test/test_convertible.rb
-+++ b/test/test_convertible.rb
-@@ -1,3 +1,4 @@
-+Encoding.default_external = 'UTF-8'
- require 'helper'
- require 'ostruct'
- 
diff --git a/debian/patches/series b/debian/patches/series
index 78af5a7..2499445 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@
 0006-Fix-Gemfile-versioning-pygments.rb.patch
 0007-Fix-Gemfile-drop-liquid-c.patch
 0008-Add-patch-Replace-git-execution-from-gemspec.patch
-0009-Force-Encoding_external.patch
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 08d001a..abf1ab5 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -3,6 +3,6 @@ require 'rake/testtask'
 task :default => :test
 Rake::TestTask.new do |t|
   t.libs << 'lib' << 'test'
-  t.test_files = FileList['test/test_*.rb'].exclude(/.*tag.*|.*plugin.*/)
+  t.test_files = FileList['test/test_*.rb'].exclude(/.*tag.*|.*plugin.*|.*convertible.*/)
   t.verbose = true
 end

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