summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-12-17 21:05:22 +0000
committerTim Harder <radhermit@gentoo.org>2013-12-17 21:05:22 +0000
commit6d8eef9d0a0abbd692a068f61d7d0fb079edf875 (patch)
treeba3b662f4e31f5ea5edef328c5bf7b408dc4db83 /net-im/bitlbee
parentUpdate milter dependency because sendmail provides milter interface as well, ... (diff)
downloadgentoo-2-6d8eef9d0a0abbd692a068f61d7d0fb079edf875.tar.gz
gentoo-2-6d8eef9d0a0abbd692a068f61d7d0fb079edf875.tar.bz2
gentoo-2-6d8eef9d0a0abbd692a068f61d7d0fb079edf875.zip
Fix tests (patch by vikraman).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'net-im/bitlbee')
-rw-r--r--net-im/bitlbee/ChangeLog6
-rw-r--r--net-im/bitlbee/bitlbee-3.2.1.ebuild3
-rw-r--r--net-im/bitlbee/files/bitlbee-3.2.1-tests.patch29
3 files changed, 36 insertions, 2 deletions
diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 10942d959a33..b3088e519008 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/bitlbee
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.166 2013/12/17 15:57:49 vikraman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.167 2013/12/17 21:05:22 radhermit Exp $
+
+ 17 Dec 2013; Tim Harder <radhermit@gentoo.org> bitlbee-3.2.1.ebuild,
+ +files/bitlbee-3.2.1-tests.patch:
+ Fix tests (patch by vikraman).
*bitlbee-3.2.1 (17 Dec 2013)
diff --git a/net-im/bitlbee/bitlbee-3.2.1.ebuild b/net-im/bitlbee/bitlbee-3.2.1.ebuild
index 7ce88228db16..4e2c15d8e26e 100644
--- a/net-im/bitlbee/bitlbee-3.2.1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.1.ebuild,v 1.1 2013/12/17 15:57:49 vikraman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.1.ebuild,v 1.2 2013/12/17 21:05:22 radhermit Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -75,6 +75,7 @@ src_prepare() {
use skype && python_fix_shebang protocols/skype/skyped.py
epatch "${FILESDIR}"/${PN}-3.2.1-configure.patch
+ epatch "${FILESDIR}"/${PN}-3.2.1-tests.patch
epatch "${FILESDIR}"/${PN}-3.0.5-parallel-make.patch
}
diff --git a/net-im/bitlbee/files/bitlbee-3.2.1-tests.patch b/net-im/bitlbee/files/bitlbee-3.2.1-tests.patch
new file mode 100644
index 000000000000..be09807658bf
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.2.1-tests.patch
@@ -0,0 +1,29 @@
+--- bitlbee-3.2.1/tests/check_nick.c
++++ bitlbee-3.2.1/tests/check_nick.c
+@@ -30,7 +30,7 @@
+ for (i = 0; get[i]; i++) {
+ char copy[60];
+ strcpy(copy, get[i]);
+- nick_strip(copy);
++ nick_strip(NULL, copy);
+ fail_unless (strcmp(copy, expected[i]) == 0,
+ "(%d) nick_strip broken: %s -> %s (expected: %s)",
+ i, get[i], copy, expected[i]);
+@@ -45,7 +45,7 @@
+ int i;
+
+ for (i = 0; nicks[i]; i++) {
+- fail_unless (nick_ok(nicks[i]) == 1,
++ fail_unless (nick_ok(NULL, nicks[i]) == 1,
+ "nick_ok() failed: %s", nicks[i]);
+ }
+ }
+@@ -58,7 +58,7 @@
+ int i;
+
+ for (i = 0; nicks[i]; i++) {
+- fail_unless (nick_ok(nicks[i]) == 0,
++ fail_unless (nick_ok(NULL, nicks[i]) == 0,
+ "nick_ok() succeeded for invalid: %s", nicks[i]);
+ }
+ }