[DRE-commits] [SCM] ruby-builder.git branch, master, updated. upstream/3.0.0-14-g45556ae

[=?UTF-8?Q?Marc=20Dequ=C3=A8nes=20?=(Duck)]

The following commit has been merged in the master branch:
commit 7d76000eed09118137b75d04a3910c707093ce63
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Sat Aug 13 13:32:32 2011 +0200

    [policy] move applied patch in 'debian/patches'

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e3aaa49
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+test_blankslate_fix_ruby_1.9
diff --git a/debian/patches/test_blankslate_fix_ruby_1.9 b/debian/patches/test_blankslate_fix_ruby_1.9
new file mode 100644
index 0000000..b192129
--- /dev/null
+++ b/debian/patches/test_blankslate_fix_ruby_1.9
@@ -0,0 +1,24 @@
+# Author: Diego Elio Pettenò <flameeyes at gmail.com>
+# Last-Update: Wed Feb 2 14:20:00 2011 +0100
+# Description:
+#  Skip blankslate tests even when using minitest.
+#  .
+#  At least with Ruby 1.9.2's minitest, simply defining the suite method is
+#  not going to be enough to skip over these tests; instead use the skip
+#  method if it's available.
+#
+Index: ruby-builder/test/test_blankslate.rb
+===================================================================
+--- ruby-builder.orig/test/test_blankslate.rb	2011-08-13 12:52:35.942452600 +0200
++++ ruby-builder/test/test_blankslate.rb	2011-08-13 12:53:05.796408262 +0200
+@@ -89,6 +89,10 @@
+   end
+ 
+   def setup
++    if Object::const_defined?(:BasicObject) and respond_to?(:skip)
++      skip "BlankSlate is not used in this environment"
++    end
++
+     @bs = BlankSlate.new
+   end
+ 
diff --git a/test/test_blankslate.rb b/test/test_blankslate.rb
index 222b9bc..a46eeb6 100644
--- a/test/test_blankslate.rb
+++ b/test/test_blankslate.rb
@@ -89,10 +89,6 @@ class TestBlankSlate < Test::Unit::TestCase
   end
 
   def setup
-    if Object::const_defined?(:BasicObject) and respond_to?(:skip)
-      skip "BlankSlate is not used in this environment" 
-    end
-
     @bs = BlankSlate.new
   end
 

-- 
ruby-builder.git