[DRE-commits] [SCM] rcov.git branch, master, updated. debian/1.0-1-4-g3d92dae

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit d01b186c12485bc035c7db40170477423433acbd
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Sun Jun 24 21:27:49 2012 +0200

    Fix the test setup by creating a missing directory and call the right ruby

diff --git a/debian/changelog b/debian/changelog
index 3e3c760..7abd659 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,12 @@ rcov (1.0-2) UNRELEASED; urgency=low
 
   * debian/control:
     - Bumped build-depend on gem2deb to 3.0.0.
+  * debian/patches: added fix_ruby_call_in_tests.patch to make the tests call
+    the correct ruby binary.
+  * debian/rules
+    - Ensure that the directory test/actual_coverage is created
+      (closes: #670829).
+  * debian/source/local-options: set "unapply-patches"
 
  -- Paul van Tilburg <paulvt at debian.org>  Sun, 24 Jun 2012 17:35:27 +0200
 
diff --git a/debian/patches/fix_ruby_call_in_tests.patch b/debian/patches/fix_ruby_call_in_tests.patch
new file mode 100644
index 0000000..78f88f2
--- /dev/null
+++ b/debian/patches/fix_ruby_call_in_tests.patch
@@ -0,0 +1,23 @@
+Description: Fix the tests to call the right ruby binary
+Author: Paul van Tilburg <paulvt at debian.org>
+Origin: vendor
+Forwarded: not-needed
+Last-Updates: 2012-06-24
+
+--- a/test/functional_test.rb
++++ b/test/functional_test.rb
+@@ -1,4 +1,5 @@
+ require File.dirname(__FILE__) + '/test_helper'
++require "rbconfig"
+ 
+ =begin
+ Updating functional testdata automatically is DANGEROUS, so I do manually.
+@@ -41,7 +42,7 @@
+   def run_rcov(opts, script="assets/sample_04.rb", opts_tail="")
+     rcov = @@dir+"../bin/rcov"
+     ruby_opts = "-I../lib:../ext/rcovrt"
+-    ruby = "ruby"
++    ruby = RbConfig::CONFIG['ruby_install_name']
+     ruby = "jruby" if RUBY_PLATFORM =~ /java/
+     with_testdir do
+       `cd #{@@dir}; #{ruby} #{ruby_opts} #{rcov} #{opts} -o actual_coverage #{script} #{opts_tail}`
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e267796
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_ruby_call_in_tests.patch
diff --git a/debian/rules b/debian/rules
index 62f1070..45d7eb3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,3 +17,11 @@ export DH_RUBY_GEMSPEC=rcov.gemspec
 override_dh_auto_install:
 	dh_auto_install
 	rm debian/rcov/usr/lib/ruby/vendor_ruby/rcov/templates/jquery*.min.js
+
+override_dh_auto_test:
+	dh_auto_test
+	mkdir test/actual_coverage
+
+override_dh_auto_clean:
+	dh_auto_clean
+	-rmdir test/actual_coverage
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-patches

-- 
rcov.git