diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-07-01 17:25:26 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-07-01 17:25:26 +0000 |
| commit | 544f433bd5f58c73c3170ee403096f1818581899 (patch) | |
| tree | 2dc887cb4cfa61b45727a6d0229bbc96c6d3fc84 /media-sound/xmms2 | |
| parent | alpha/ia64/m68k/s390/sh/sparc stable wrt #419663 (diff) | |
| download | gentoo-2-544f433bd5f58c73c3170ee403096f1818581899.tar.gz gentoo-2-544f433bd5f58c73c3170ee403096f1818581899.tar.bz2 gentoo-2-544f433bd5f58c73c3170ee403096f1818581899.zip | |
Workaround build failure when test failure occurs. Rerun tests in src_test(). It moves valgrind misconfiguration error to src_test() phase (bug #424377 by Diego Elio Pettenò).
(Portage version: 2.2.0_alpha110_p5/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/xmms2')
| -rw-r--r-- | media-sound/xmms2/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/xmms2/xmms2-0.8-r1.ebuild | 12 |
2 files changed, 15 insertions, 4 deletions
diff --git a/media-sound/xmms2/ChangeLog b/media-sound/xmms2/ChangeLog index 16293e2f85cb..b19f7d2eb23e 100644 --- a/media-sound/xmms2/ChangeLog +++ b/media-sound/xmms2/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/xmms2 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.26 2012/05/05 08:56:07 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.27 2012/07/01 17:25:26 slyfox Exp $ + + 01 Jul 2012; Sergei Trofimovich <slyfox@gentoo.org> xmms2-0.8-r1.ebuild: + Workaround build failure when test failure occurs. Rerun tests in src_test(). + It moves valgrind misconfiguration error to src_test() phase (bug #424377 by + Diego Elio Pettenò). 05 May 2012; Michał Górny <mgorny@gentoo.org> xmms2-0.7-r2.ebuild, xmms2-0.7-r3.ebuild, xmms2-0.8-r1.ebuild: diff --git a/media-sound/xmms2/xmms2-0.8-r1.ebuild b/media-sound/xmms2/xmms2-0.8-r1.ebuild index 684b5adf2bff..6f692bfb5df1 100644 --- a/media-sound/xmms2/xmms2-0.8-r1.ebuild +++ b/media-sound/xmms2/xmms2-0.8-r1.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/media-sound/xmms2/xmms2-0.8-r1.ebuild,v 1.6 2012/05/05 08:56:07 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild,v 1.7 2012/07/01 17:25:26 slyfox Exp $ EAPI=3 @@ -232,8 +232,14 @@ src_configure() { } src_compile() { - # also runs tests if 'use test' in enabled (see tests option) - ./waf build || die "waf build failed" + # waf is very keen to run tests in build phase (bug #424377) but + # it does not bother running tests twice, so the hack below works: + ./waf build || ./waf build || die "waf build failed" +} + +src_test() { + # rerun tests + ./waf --alltests || die "waf --alltests failed" } src_install() { |