[DRE-commits] [ruby-concurrent] 03/08: Add patches

[Balasankar C]

This is an automated email from the git hooks/post-receive script.

balasankarc-guest pushed a commit to branch master
in repository ruby-concurrent.

commit 0cf8c0b5d594cc5aba7a99e1441464b22d4f31e3
Author: Balasankar C <balasankarc at autistici.org>
Date:   Wed Dec 30 00:25:10 2015 +0530

    Add patches
---
 debian/patches/add-spec.patch              |  0
 debian/patches/adsf                        |  9 -------
 debian/patches/disable-failing-tests.patch | 43 ++++++++++++++++++++++++++++++
 debian/patches/remove-git.patch            | 10 +++++++
 debian/patches/series                      |  4 +--
 5 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/debian/patches/add-spec.patch b/debian/patches/add-spec.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/patches/adsf b/debian/patches/adsf
deleted file mode 100644
index 9503bfe..0000000
--- a/debian/patches/adsf
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,5 +1,6 @@
- $VERBOSE = nil # suppress our deprecation warnings
- 
-+
- # wwe can't use our helpers here because we need to load the gem _after_ simplecov
- unless RUBY_ENGINE == 'jruby' && 0 == (JRUBY_VERSION =~ /^9\.0\.0\.0/)
-   if ENV['COVERAGE'] || ENV['CI'] || ENV['TRAVIS']
diff --git a/debian/patches/disable-failing-tests.patch b/debian/patches/disable-failing-tests.patch
new file mode 100644
index 0000000..78efaf3
--- /dev/null
+++ b/debian/patches/disable-failing-tests.patch
@@ -0,0 +1,43 @@
+Description: Disable tests
+ As per upstream, some of the tests are not part of the core gem, but of the
+ additional gems that may be built from the same source directory. So disabling
+ them.
+Author: Balasankar C <balasankarc at autistici.org>
+Bug: https://github.com/ruby-concurrency/concurrent-ruby/issues/484
+Last-Update: 2015-12-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/spec/concurrent/channel_spec.rb
++++ b/spec/concurrent/channel_spec.rb
+@@ -598,19 +598,19 @@
+           }.to raise_error(ArgumentError)
+         end
+ 
+-        it 'loops until the block returns false' do
+-          actual = 0
+-          expected = 3
+-          latch = Concurrent::CountDownLatch.new(expected)
+-          Channel.go_loop do
+-            actual += 1
+-            latch.count_down
+-            actual < expected
+-          end
++        #it 'loops until the block returns false' do
++          #actual = 0
++          #expected = 3
++          #latch = Concurrent::CountDownLatch.new(expected)
++          #Channel.go_loop do
++            #actual += 1
++            #latch.count_down
++            #actual < expected
++          #end
+ 
+-          latch.wait(10)
+-          expect(actual).to eq expected
+-        end
++          #latch.wait(10)
++          #expect(actual).to eq expected
++        #end
+       end
+ 
+       context '.go_loop_via' do
diff --git a/debian/patches/remove-git.patch b/debian/patches/remove-git.patch
new file mode 100644
index 0000000..a6af32d
--- /dev/null
+++ b/debian/patches/remove-git.patch
@@ -0,0 +1,10 @@
+--- a/concurrent-ruby.gemspec
++++ b/concurrent-ruby.gemspec
+@@ -5,7 +5,6 @@
+ require 'file_map'
+ 
+ Gem::Specification.new do |s|
+-  git_files = `git ls-files`.split("\n")
+ 
+   s.name             = 'concurrent-ruby'
+   s.version          = Concurrent::VERSION
diff --git a/debian/patches/series b/debian/patches/series
index 7bd2413..1c124e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-adsf
-add-spec.patch
+remove-git.patch
+disable-failing-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-concurrent.git