[DRE-commits] [SCM] ruby-raindrops.git branch, master, updated. upstream/0.8.0-23-g0a740f9

[Hleb Valoshka]

The following commit has been merged in the master branch:
commit 80c7403181cf2e033bc590ef4f015967c398b675
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date:   Wed May 16 15:04:07 2012 +0300

    Drop unneeded or useless patches

diff --git a/debian/patches/0002-Test-suite-fix-for-non-linux-users.patch b/debian/patches/0002-Test-suite-fix-for-non-linux-users.patch
deleted file mode 100644
index 9666567..0000000
--- a/debian/patches/0002-Test-suite-fix-for-non-linux-users.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Jeremy Evans <code at jeremyevans.net>
-Date: Mon, 14 Nov 2011 18:31:53 +0000
-Subject: Test suite fix for non-linux users
-
-Most other linux-specific test files have this, but
-test_linux_tcp_info.rb does not.
-
-With this patch, gmake test passes on OpenBSD.
----
- test/test_linux_tcp_info.rb |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test_linux_tcp_info.rb b/test/test_linux_tcp_info.rb
-index f429d1d..3b4a245 100644
---- a/test/test_linux_tcp_info.rb
-+++ b/test/test_linux_tcp_info.rb
-@@ -58,4 +58,4 @@ class TestLinuxTCP_Info < Test::Unit::TestCase
-       a.close if a
-       s.close
-   end
--end
-+end if RUBY_PLATFORM =~ /linux/
diff --git a/debian/patches/0004-Try-to-fix-test_incr_decr-for-kfreebsd-hurd.patch b/debian/patches/0004-Try-to-fix-test_incr_decr-for-kfreebsd-hurd.patch
deleted file mode 100644
index d4e3fba..0000000
--- a/debian/patches/0004-Try-to-fix-test_incr_decr-for-kfreebsd-hurd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Hleb Valoshka <375GNU at Gmail.COM>
-Date: Tue, 17 Apr 2012 19:48:22 +0300
-Subject: Try to fix test_incr_decr for kfreebsd/hurd
-
----
- test/test_raindrops.rb |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/test_raindrops.rb b/test/test_raindrops.rb
-index 67089b7..ac5c03e 100644
---- a/test/test_raindrops.rb
-+++ b/test/test_raindrops.rb
-@@ -63,10 +63,10 @@ class TestRaindrops < Test::Unit::TestCase
- 
-   def test_incr_decr
-     rd = Raindrops.new(1)
--    fork { 1000000.times { rd.incr(0) } }
-+    pid = fork { 1000000.times { rd.incr(0) } }
-     1000.times { rd.decr(0) }
--    statuses = Process.waitall
--    statuses.each { |pid, status| assert status.success? }
-+    _, status = Process.waitpid2(pid)
-+    assert status.success?
-     assert_equal [999000], rd.to_ary
-   end
- 
diff --git a/debian/patches/series b/debian/patches/series
index 174f38f..540c014 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 0001-Test-suite-fix-for-IPv6.patch
-0002-Test-suite-fix-for-non-linux-users.patch
 0003-Invoke-unix_listener_stats-conditionally.patch
-0004-Try-to-fix-test_incr_decr-for-kfreebsd-hurd.patch

-- 
ruby-raindrops.git