[DRE-commits] [SCM] ruby-test-spec.git branch, master, updated. upstream/0.10.0-8-gcc337f8

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 7d534773d2da4d0818435c96b9b43a6caa682145
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Sep 22 00:45:08 2011 +0200

    patches to avoid load_path manipulations and work with ruby-test-unit

diff --git a/debian/patches/0010-disable_invalid_test_exception.patch b/debian/patches/0010-disable_invalid_test_exception.patch
new file mode 100644
index 0000000..32a698f
--- /dev/null
+++ b/debian/patches/0010-disable_invalid_test_exception.patch
@@ -0,0 +1,22 @@
+Description: avoid throwing :invalid_test expection
+ This exception is used in the version of Test::Unit bundled with
+ Ruby1.8 but is not catched in the newer version packaged in
+ ruby-test-unit.
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-09-20
+
+--- a/lib/test/spec.rb
++++ b/lib/test/spec.rb
+@@ -352,9 +352,9 @@
+     def initialize(name)
+       super name
+ 
+-      # Don't let the default_test clutter up the results and don't
+-      # flunk if no tests given, either.
+-      throw :invalid_test  if name.to_s == "default_test"
++      ## Don't let the default_test clutter up the results and don't
++      ## flunk if no tests given, either.
++      #throw :invalid_test  if name.to_s == "default_test"
+     end
+ 
+     def position
diff --git a/debian/patches/0020-remove_load_path_manipulations_in_tests.patch b/debian/patches/0020-remove_load_path_manipulations_in_tests.patch
new file mode 100644
index 0000000..9c7c4a2
--- /dev/null
+++ b/debian/patches/0020-remove_load_path_manipulations_in_tests.patch
@@ -0,0 +1,20 @@
+Description: remove $LOAD_PATH manipulations in tests
+ This is not needed since test-runner is taking care of the update
+ of $LOAD_PATH before running tests.
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-09-20
+
+--- a/test/spec_should-output.rb
++++ b/test/spec_should-output.rb
+@@ -1,4 +1,3 @@
+-$: << File.dirname(__FILE__) + '/../lib/'
+ require 'test/spec'
+ require 'test/spec/should-output'
+ 
+--- a/test/spec_testspec.rb
++++ b/test/spec_testspec.rb
+@@ -1,4 +1,3 @@
+-$: << File.dirname(__FILE__) + '/../lib/'
+ require 'test/spec'
+ 
+ $WARNING = ""
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d18990a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0010-disable_invalid_test_exception.patch
+0020-remove_load_path_manipulations_in_tests.patch
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

-- 
ruby-test-spec.git