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

Hleb Valoshka 375GNU at Gmail.COM
Sun Mar 4 17:22:34 UTC 2012


The following commit has been merged in the master branch:
commit a6ca92046358b26cdd613c252f45efb10ca9b862
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date:   Sat Mar 3 14:08:13 2012 +0300

    fix tests on non-linux

diff --git a/debian/changelog b/debian/changelog
index 964e2e6..9b1a15f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-raindrops (0.8.0-2) unstable; urgency=low
+
+  * Backport upstream commit 499e63e2 to fix tests under non-Linux
+
+ -- Hleb Valoshka <375gnu at gmail.com>  Sat, 03 Mar 2012 14:02:48 +0300
+
 ruby-raindrops (0.8.0-1) unstable; urgency=low
 
   * Initial release (Closes: #660342)
diff --git a/debian/patches/fix-test-for-non-linux b/debian/patches/fix-test-for-non-linux
new file mode 100644
index 0000000..8750be9
--- /dev/null
+++ b/debian/patches/fix-test-for-non-linux
@@ -0,0 +1,22 @@
+From 499e63e2666f88134f7d47f3bcfdfedd72396e70 Mon Sep 17 00:00:00 2001
+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.
+---
+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/
+--
+cgit v0.9.0.2-54-g2d9a
diff --git a/debian/patches/series b/debian/patches/series
index 07d15df..ac1c431 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-test-for-ipv6
+fix-test-for-non-linux

-- 
ruby-raindrops.git



More information about the Pkg-ruby-extras-commits mailing list