[DRE-commits] [ruby-libxml] 02/02: oops, revert skipping patch on s390x

[Antonio Terceiro]

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

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

commit 7cdc9c0f3785379976ce7a5fb8b286de8cd115cc
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Jul 24 09:52:43 2015 -0300

    oops, revert skipping patch on s390x
    
    actually it just failed for me on amd64 as well
---
 debian/changelog                                   |  4 +---
 debian/patches/series                              |  1 -
 .../patches/skip-problematic-test-on-x390x.patch   | 25 ----------------------
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f7fe7df..39be30b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,6 @@
-ruby-libxml (2.8.0-2) unstable; urgency=medium
+ruby-libxml (2.8.0-2) UNRELEASED; urgency=medium
 
   * Team upload
-  * skip-problematic-test-on-x390x.patch: on s390x, skip on test that
-    consistently fails on the buildd, but not on the porterbox
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 24 Jul 2015 09:48:57 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 85b7c27..bbb7649 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0100_run_builtin_shell_command_ulimit_in_tests.patch
 libxml2-2.9.2.patch
 avoid_infinite_loop_ruby22.patch
-skip-problematic-test-on-x390x.patch
diff --git a/debian/patches/skip-problematic-test-on-x390x.patch b/debian/patches/skip-problematic-test-on-x390x.patch
deleted file mode 100644
index 0c25c98..0000000
--- a/debian/patches/skip-problematic-test-on-x390x.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: skip problematic test on s390x
- For some weird reason, this test fails only on the s390x buildd, but *not* on
- the s390x ported box.
-Author: Antonio Terceiro <terceiro at debian.org>
-Origin: vendor
-Forwarded: not-needed
-
---- ruby-libxml-2.8.0.orig/test/tc_reader.rb
-+++ ruby-libxml-2.8.0/test/tc_reader.rb
-@@ -53,7 +53,7 @@ class TestReader < Test::Unit::TestCase
-   def test_document
-     reader = XML::Reader.document(XML::Document.file(XML_FILE))
-     verify_simple(reader)
--  end
-+  end unless RbConfig::CONFIG['arch'] =~ /s390x/
- 
-   def test_file
-     reader = XML::Reader.file(XML_FILE)
-@@ -397,4 +397,4 @@ class TestReader < Test::Unit::TestCase
-     # Encoding is always null for strings, very annoying!
-     assert_equal(reader.encoding, XML::Encoding::NONE)
-   end
--end
-\ No newline at end of file
-+end

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