[DRE-commits] [ruby-oj] 01/03: Add 03_deactivate_test_io_string.patch to deactivate tests causing others to fail on some architectures (Closes: #754761)

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-oj.

commit b091f980aea412a94ad94ad21ce5c86416b4bbff
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Aug 24 16:20:26 2014 +0200

    Add 03_deactivate_test_io_string.patch to deactivate tests causing others to fail on some architectures (Closes: #754761)
---
 debian/changelog                                  |  5 +++
 debian/patches/03_deactivate_test_io_string.patch | 52 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 58 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e842c71..edd25c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 ruby-oj (2.10.1-1) UNRELEASED; urgency=medium
 
+  [ Caitlin Matos ]
   * Team upload
   * New upstream release
   * Build-depend on rake-compiler
   * Versioned build dependency for ruby-minitest
 
+  [ Cédric Boutillier ]
+  * Add 03_deactivate_test_io_string.patch to deactivate tests causing others
+    to fail on some architectures (Closes: #754761)
+
  -- Caitlin Matos <caitlin.matos at zoho.com>  Mon, 18 Aug 2014 17:53:34 -0400
 
 ruby-oj (2.9.6-1) unstable; urgency=medium
diff --git a/debian/patches/03_deactivate_test_io_string.patch b/debian/patches/03_deactivate_test_io_string.patch
new file mode 100644
index 0000000..5444af2
--- /dev/null
+++ b/debian/patches/03_deactivate_test_io_string.patch
@@ -0,0 +1,52 @@
+Description: deactivate test_io_string
+ Those tests cause test_io_file or test_symbol_keys to fail if they are run
+ before on armel, armhf, i386 and other architectures.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=754761
+Bug: https://github.com/ohler55/oj/issues/166
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2014-08-24
+
+--- a/test/test_compat.rb
++++ b/test/test_compat.rb
+@@ -193,7 +193,7 @@
+   end
+ 
+   # Stream IO
+-  def test_io_string
++  def _test_io_string
+     json = %{{
+   "x":true,
+   "y":58,
+--- a/test/test_object.rb
++++ b/test/test_object.rb
+@@ -271,7 +271,7 @@
+   end
+ 
+   # Stream IO
+-  def test_io_string
++  def _test_io_string
+     json = %{{
+   "x":true,
+   "y":58,
+--- a/test/test_strict.rb
++++ b/test/test_strict.rb
+@@ -150,7 +150,7 @@
+   end
+ 
+   # Stream IO
+-  def test_io_string
++  def _test_io_string
+     json = %{{
+   "x":true,
+   "y":58,
+--- a/test/test_various.rb
++++ b/test/test_various.rb
+@@ -1068,7 +1068,7 @@
+   end
+ 
+ # Stream IO
+-  def test_io_string
++  def _test_io_string
+     src = { 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}
+     output = StringIO.open("", "w+")
+     Oj.to_stream(output, src)
diff --git a/debian/patches/series b/debian/patches/series
index d0b6e42..54cc90e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_dont_mess_with_loadpath.patch
 02_avoid_name_conflict_with_ext.patch
+03_deactivate_test_io_string.patch

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