[DRE-commits] [SCM] ruby-mkrf.git branch, master, updated. upstream/0.2.3-16-gc3e579d

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit a01b67fccd7fdf28c14963c95a5dd2396178a4e5
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Dec 15 18:08:21 2011 +0100

    patch: fix test to support modifications for Ruby1.9+

diff --git a/debian/patches/0300_fix_test_default_include_dir_should_be_from_rbconfig.patch b/debian/patches/0300_fix_test_default_include_dir_should_be_from_rbconfig.patch
new file mode 100644
index 0000000..ead87d6
--- /dev/null
+++ b/debian/patches/0300_fix_test_default_include_dir_should_be_from_rbconfig.patch
@@ -0,0 +1,30 @@
+Description: fix test to reflect the full definition of DEFAULT_INCLUDES
+ A modification has been made to the library has been made in
+ lib/mkrf/availability.rb to take into account the change of include directories
+ for Ruby 1.9+ This patch brings the modification to the tests.
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-12-15
+
+--- a/test/unit/test_availability.rb
++++ b/test/unit/test_availability.rb
+@@ -136,9 +136,16 @@
+   end
+   
+   def test_default_include_dir_should_be_from_rbconfig
+-    expected = [Config::CONFIG['includedir'], Config::CONFIG["archdir"],
++    #Fix to correspond to the definition in lib/mkrf/availability.rb (Debian patch)
++    if Config::CONFIG['rubyhdrdir']
++      expected = [Config::CONFIG['rubyhdrdir'],
++                Config::CONFIG['rubyhdrdir'] + "/" + Config::CONFIG['arch'],
++                Config::CONFIG["archdir"],Config::CONFIG['sitelibdir'], "."]
++    else
++      expected = [Config::CONFIG['includedir'], Config::CONFIG["archdir"],
+                 Config::CONFIG['sitelibdir'], "."]
+-                
++    end
++
+     assert_equal expected, @avail.send(:instance_variable_get, :@includes)
+   end
+-end
+\ No newline at end of file
++end
diff --git a/debian/patches/series b/debian/patches/series
index 5f82ee1..485b02b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0100_remove_rubygems.patch
 0200_remove_load_path_manipulations.rb
+0300_fix_test_default_include_dir_should_be_from_rbconfig.patch

-- 
ruby-mkrf.git