[ruby-RMagick] Add test sources.

Vít Ondruch vondruch at fedoraproject.org
Tue Feb 7 12:34:11 UTC 2012


commit 751c3438d9b311640472275adfbaf7f8c7c45bb2
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Feb 7 13:33:50 2012 +0100

    Add test sources.

 .gitignore                                   |    1 +
 RMagick-2.13.1-fix-arch-dependent-test.patch |   26 ++++++++
 RMagick-2.13.1-fix-test-for-Ruby-1.9.3.patch |   88 ++++++++++++++++++++++++++
 sources                                      |    1 +
 4 files changed, 116 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 16f6d43..040eba7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 RMagick-2.13.1.tar.bz2
+/RMagick-2.13.1-tests.tgz
diff --git a/RMagick-2.13.1-fix-arch-dependent-test.patch b/RMagick-2.13.1-fix-arch-dependent-test.patch
new file mode 100644
index 0000000..c667a64
--- /dev/null
+++ b/RMagick-2.13.1-fix-arch-dependent-test.patch
@@ -0,0 +1,26 @@
+From 02893caaff791ee1a0fcd765df273235068af43f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
+Date: Tue, 7 Feb 2012 12:21:49 +0100
+Subject: [PATCH] Fix arch dependent test.
+
+---
+ test/Image2.rb |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/test/Image2.rb b/test/Image2.rb
+index dedf3a5..d2065e2 100644
+--- a/test/Image2.rb
++++ b/test/Image2.rb
+@@ -582,7 +582,8 @@ class Image2_UT < Test::Unit::TestCase
+         end
+         assert_nothing_raised do
+             res = @img.export_pixels_to_str(0, 0, 10, 10, "I", Magick::LongPixel)
+-            assert_equal(10*10*4, res.length)
++            # "1.size" used for arch dependent size.
++            assert_equal(10*10*1.size, res.length)
+         end
+         assert_nothing_raised do
+             res = @img.export_pixels_to_str(0, 0, 10, 10, "I", Magick::FloatPixel)
+-- 
+1.7.7.6
+
diff --git a/RMagick-2.13.1-fix-test-for-Ruby-1.9.3.patch b/RMagick-2.13.1-fix-test-for-Ruby-1.9.3.patch
new file mode 100644
index 0000000..b1b64b7
--- /dev/null
+++ b/RMagick-2.13.1-fix-test-for-Ruby-1.9.3.patch
@@ -0,0 +1,88 @@
+From 9494cc6c1439df7d3a434a95292f2e295affd07f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
+Date: Tue, 7 Feb 2012 11:59:37 +0100
+Subject: [PATCH] Fix test for Ruby 1.9.3.
+
+---
+ test/Image1.rb           |    2 +-
+ test/Image2.rb           |    2 +-
+ test/Image3.rb           |    4 ++--
+ test/ImageList1.rb       |    2 +-
+ test/Image_attributes.rb |    2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/Image1.rb b/test/Image1.rb
+index bcda7ca..0e0ff2b 100644
+--- a/test/Image1.rb
++++ b/test/Image1.rb
+@@ -6,7 +6,7 @@ require 'test/unit/ui/console/testrunner' if RUBY_VERSION != '1.9.1'
+ 
+ 
+ class Image1_UT < Test::Unit::TestCase
+-    FreezeError = RUBY_VERSION == '1.9.1' ? RuntimeError : TypeError
++    FreezeError = RUBY_VERSION >= '1.9.1' ? RuntimeError : TypeError
+ 
+     def setup
+         @img = Magick::Image.new(20, 20)
+diff --git a/test/Image2.rb b/test/Image2.rb
+index 45dc682..dedf3a5 100644
+--- a/test/Image2.rb
++++ b/test/Image2.rb
+@@ -8,7 +8,7 @@ require 'test/unit/ui/console/testrunner'  if RUBY_VERSION != '1.9.1'
+ 
+ 
+ class Image2_UT < Test::Unit::TestCase
+-    FreezeError = RUBY_VERSION == '1.9.1' ? RuntimeError : TypeError
++    FreezeError = RUBY_VERSION >= '1.9.1' ? RuntimeError : TypeError
+ 
+     def setup
+         @img = Magick::Image.new(20, 20)
+diff --git a/test/Image3.rb b/test/Image3.rb
+index 09576cf..11ad220 100644
+--- a/test/Image3.rb
++++ b/test/Image3.rb
+@@ -33,7 +33,7 @@ ColorspaceTypes = [
+ 
+ 
+ class Image3_UT < Test::Unit::TestCase
+-    FreezeError = RUBY_VERSION == '1.9.1' ? RuntimeError : TypeError
++    FreezeError = RUBY_VERSION >= '1.9.1' ? RuntimeError : TypeError
+ 
+     def setup
+         @img = Magick::Image.new(20, 20)
+@@ -998,4 +998,4 @@ if __FILE__ == $0
+ IMAGES_DIR = '../doc/ex/images'
+ FILES = Dir[IMAGES_DIR+'/Button_*.gif']
+ Test::Unit::UI::Console::TestRunner.run(Image3_UT) if RUBY_VERSION != '1.9.1'
+-end
+\ No newline at end of file
++end
+diff --git a/test/ImageList1.rb b/test/ImageList1.rb
+index d94c0db..d6c2cd9 100644
+--- a/test/ImageList1.rb
++++ b/test/ImageList1.rb
+@@ -500,7 +500,7 @@ class ImageList1_UT < Test::Unit::TestCase
+         assert_raise(ArgumentError) { @list.map! { 2 } }
+     end
+ 
+-    if RUBY_VERSION != '1.9.1'
++    if RUBY_VERSION < '1.9.1'
+        def test_nitems
+          n = nil
+          assert_nothing_raised { n = @list.nitems }
+diff --git a/test/Image_attributes.rb b/test/Image_attributes.rb
+index b9ab83f..1743f10 100644
+--- a/test/Image_attributes.rb
++++ b/test/Image_attributes.rb
+@@ -12,7 +12,7 @@ require 'test/unit/ui/console/testrunner'  if RUBY_VERSION != '1.9.1'
+ 
+ 
+ class Image_Attributes_UT < Test::Unit::TestCase
+-    FreezeError = RUBY_VERSION == '1.9.1' ? RuntimeError : TypeError
++    FreezeError = RUBY_VERSION >= '1.9.1' ? RuntimeError : TypeError
+ 
+     def setup
+         @img = Magick::Image.new(100, 100)
+-- 
+1.7.7.6
+
diff --git a/sources b/sources
index 3169ff0..83f6ba6 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+b21573a609e8f6bc1f3ab625c2069686  RMagick-2.13.1-tests.tgz
 fa419869d5533884e4556c8b8b390adb  RMagick-2.13.1.tar.bz2


More information about the scm-commits mailing list