[DRE-commits] [SCM] ruby-mkrf.git branch, master, updated. debian/0.2.3+dfsg-1-7-g0a0e804

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit cc18387cd70ed3b4c3db86ef30e66e6865c2f593
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Wed Jul 4 12:26:11 2012 +0200

    add 0400_use_correct_ruby_version_in_tests.patch

diff --git a/debian/patches/0400_use_correct_ruby_version_in_tests.patch b/debian/patches/0400_use_correct_ruby_version_in_tests.patch
new file mode 100644
index 0000000..e5c2816
--- /dev/null
+++ b/debian/patches/0400_use_correct_ruby_version_in_tests.patch
@@ -0,0 +1,45 @@
+Description: Use the same Ruby binary to run the tests and to create Rakefiles
+ Gem2deb defines the RUBY_TEST_BIN environment variable. Use it to call the
+ correct version of the Ruby binary during tests on extconf.rb to generate
+ Rakefiles.
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2012-07-04
+
+--- a/Rakefile
++++ b/Rakefile
+@@ -18,6 +18,8 @@
+ RUBY_FORGE_PROJECT = "mkrf"
+ RUBY_FORGE_USER    = "kevinclark"
+ 
++RUBY_TEST_BIN = ENV['RUBY_TEST_BIN']
++
+ 
+ task :default => ["test:units"]
+ 
+@@ -55,22 +57,22 @@
+     
+     desc "Try to compile a trivial extension"
+     task :trivial do
+-      sh "cd #{SAMPLE_DIRS[:trivial]}; ruby extconf.rb; rake"
++      sh "cd #{SAMPLE_DIRS[:trivial]}; #{RUBY_TEST_BIN} extconf.rb; rake"
+     end
+     
+     desc "Try to compile libxml"
+     task :libxml do
+-      sh "cd #{SAMPLE_DIRS[:libxml]}; ruby extconf.rb; rake"
++      sh "cd #{SAMPLE_DIRS[:libxml]}; #{RUBY_TEST_BIN} extconf.rb; rake"
+     end
+     
+     desc "Try to compile syck"
+     task :syck do
+-      sh "cd #{SAMPLE_DIRS[:syck]}; ruby extconf.rb; rake"
++      sh "cd #{SAMPLE_DIRS[:syck]}; #{RUBY_TEST_BIN} extconf.rb; rake"
+     end
+     
+     desc "Try to compile cpp_bang"
+     task :cpp_bang do
+-      sh "cd #{SAMPLE_DIRS[:cpp_bang]}; ruby mkrf_config.rb; rake"
++      sh "cd #{SAMPLE_DIRS[:cpp_bang]}; #{RUBY_TEST_BIN} mkrf_config.rb; rake"
+     end
+ 
+     desc "Clean up after sample tests"

-- 
ruby-mkrf.git