summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-09-25 15:52:27 +0000
committerJeroen Roovers <jer@gentoo.org>2012-09-25 15:52:27 +0000
commit8925a20b388a3daae14f1f68d2dd43361aab09f7 (patch)
treea26a5a79a6688cee2a464517b79c05d3c09551f2 /app-text
parentgames-roguelike/falconseye is gone (diff)
downloadgentoo-2-8925a20b388a3daae14f1f68d2dd43361aab09f7.tar.gz
gentoo-2-8925a20b388a3daae14f1f68d2dd43361aab09f7.tar.bz2
gentoo-2-8925a20b388a3daae14f1f68d2dd43361aab09f7.zip
Fix hang in test suite when an incompatible screenrc is found.
(Portage version: 2.2.0_alpha132/cvs/Linux x86_64)
Diffstat (limited to 'app-text')
-rw-r--r--app-text/wdiff/ChangeLog5
-rw-r--r--app-text/wdiff/wdiff-1.1.2.ebuild10
2 files changed, 13 insertions, 2 deletions
diff --git a/app-text/wdiff/ChangeLog b/app-text/wdiff/ChangeLog
index d01df3a5e7a5..dd7d870c5f61 100644
--- a/app-text/wdiff/ChangeLog
+++ b/app-text/wdiff/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-text/wdiff
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/ChangeLog,v 1.77 2012/09/23 08:35:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/ChangeLog,v 1.78 2012/09/25 15:52:27 jer Exp $
+
+ 25 Sep 2012; Jeroen Roovers <jer@gentoo.org> wdiff-1.1.2.ebuild:
+ Fix hang in test suite when an incompatible screenrc is found.
23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> wdiff-1.1.2.ebuild:
x86 stable wrt bug #428906
diff --git a/app-text/wdiff/wdiff-1.1.2.ebuild b/app-text/wdiff/wdiff-1.1.2.ebuild
index 6ad2d3b51e65..c84733b916e6 100644
--- a/app-text/wdiff/wdiff-1.1.2.ebuild
+++ b/app-text/wdiff/wdiff-1.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-1.1.2.ebuild,v 1.6 2012/09/23 08:35:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-1.1.2.ebuild,v 1.7 2012/09/25 15:52:27 jer Exp $
EAPI=4
@@ -22,3 +22,11 @@ src_configure() {
econf \
$(use_enable experimental)
}
+
+src_test() {
+ # The test suite hangs in the '3: use pager' test
+ # when an incompatible screenrc is found
+ touch tests/screenrc || die
+ export SYSSCREENRC=tests/screenrc SCREENRC=tests/screenrc
+ default
+}