[rubygem-gobject-introspection] Yet more test failure fix
Mamoru TASAKA
mtasaka at fedoraproject.org
Mon Jan 27 07:08:06 UTC 2014
commit b76d5979f427cb417a5cb4f9e6997ae248920fa0
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Mon Jan 27 16:08:24 2014 +0900
Yet more test failure fix
gi-2.1.0-test-maybe-fix-test-failure-on-i686.patch | 58 ++++++++++++++++++++
rubygem-gobject-introspection.spec | 3 +
2 files changed, 61 insertions(+), 0 deletions(-)
---
diff --git a/gi-2.1.0-test-maybe-fix-test-failure-on-i686.patch b/gi-2.1.0-test-maybe-fix-test-failure-on-i686.patch
index 6441d27..e71d218 100644
--- a/gi-2.1.0-test-maybe-fix-test-failure-on-i686.patch
+++ b/gi-2.1.0-test-maybe-fix-test-failure-on-i686.patch
@@ -61,3 +61,61 @@ index aef5578..852b82c 100644
--
1.8.5.2
+From cceea586f6e278c91e1aa0ae3f1ffdb10a5272a5 Mon Sep 17 00:00:00 2001
+From: Kouhei Sutou <kou at clear-code.com>
+Date: Sun, 19 Jan 2014 14:03:53 +0900
+Subject: [PATCH 2/2] gi test: loose test strictness to work on i686, x86_64
+ and armv7hl
+
+GitHub: really fix #216
+
+Reported by mtasaka. Thanks!!!
+---
+ gobject-introspection/test/test-struct-info.rb | 23 ++---------------------
+ 1 file changed, 2 insertions(+), 21 deletions(-)
+
+diff --git a/gobject-introspection/test/test-struct-info.rb b/gobject-introspection/test/test-struct-info.rb
+index 852b82c..c5439a1 100644
+--- a/gobject-introspection/test/test-struct-info.rb
++++ b/gobject-introspection/test/test-struct-info.rb
+@@ -40,15 +40,11 @@ class TestStructInfo < Test::Unit::TestCase
+ end
+
+ def test_size
+- need_ruby_2_0
+- need_fiddle
+- assert_equal(16 + Fiddle::SIZEOF_SIZE_T, @info.size)
++ assert_operator(@info.size, :>=, 20)
+ end
+
+ def test_alignment
+- need_ruby_2_0
+- need_fiddle
+- assert_equal(Fiddle::ALIGN_SIZE_T, @info.alignment)
++ assert_operator(@info.alignment, :>=, 4)
+ end
+
+ def test_gtype_struct?
+@@ -58,19 +54,4 @@ class TestStructInfo < Test::Unit::TestCase
+ def test_foreign?
+ assert_false(@info.foreign?)
+ end
+-
+- private
+- def need_ruby_2_0
+- if RUBY_VERSION < "2.0.0"
+- omit("need Ruby 2.0.0 or later")
+- end
+- end
+-
+- def need_fiddle
+- begin
+- require "fiddle"
+- rescue LoadError
+- omit("need fiddle")
+- end
+- end
+ end
+--
+1.8.5.3
+
diff --git a/rubygem-gobject-introspection.spec b/rubygem-gobject-introspection.spec
index 9a19eac..465076f 100644
--- a/rubygem-gobject-introspection.spec
+++ b/rubygem-gobject-introspection.spec
@@ -155,6 +155,9 @@ popd
%exclude %{gem_instdir}/test/
%changelog
+* Mon Jan 27 2014 Mamoru TASAKA <mtasaka at fedoraproject.org>
+- Yet more test failure fix
+
* Sun Jan 19 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.1.0-2
- Fix test failure, patch from upstream
More information about the scm-commits
mailing list