| 1 |
slyfox 12/07/01 17:25:26 |
| 2 |
|
| 3 |
Modified: xmms2-0.8-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
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ò). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha110_p5/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.7 media-sound/xmms2/xmms2-0.8-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild?rev=1.7&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild?rev=1.7&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild?r1=1.6&r2=1.7 |
| 15 |
|
| 16 |
Index: xmms2-0.8-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild,v |
| 19 |
retrieving revision 1.6 |
| 20 |
retrieving revision 1.7 |
| 21 |
diff -u -r1.6 -r1.7 |
| 22 |
--- xmms2-0.8-r1.ebuild 5 May 2012 08:56:07 -0000 1.6 |
| 23 |
+++ xmms2-0.8-r1.ebuild 1 Jul 2012 17:25:26 -0000 1.7 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild,v 1.6 2012/05/05 08:56:07 mgorny Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild,v 1.7 2012/07/01 17:25:26 slyfox Exp $ |
| 29 |
|
| 30 |
EAPI=3 |
| 31 |
|
| 32 |
@@ -232,8 +232,14 @@ |
| 33 |
} |
| 34 |
|
| 35 |
src_compile() { |
| 36 |
- # also runs tests if 'use test' in enabled (see tests option) |
| 37 |
- ./waf build || die "waf build failed" |
| 38 |
+ # waf is very keen to run tests in build phase (bug #424377) but |
| 39 |
+ # it does not bother running tests twice, so the hack below works: |
| 40 |
+ ./waf build || ./waf build || die "waf build failed" |
| 41 |
+} |
| 42 |
+ |
| 43 |
+src_test() { |
| 44 |
+ # rerun tests |
| 45 |
+ ./waf --alltests || die "waf --alltests failed" |
| 46 |
} |
| 47 |
|
| 48 |
src_install() { |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.27 media-sound/xmms2/ChangeLog |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2/ChangeLog?rev=1.27&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2/ChangeLog?rev=1.27&content-type=text/plain |
| 56 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xmms2/ChangeLog?r1=1.26&r2=1.27 |
| 57 |
|
| 58 |
Index: ChangeLog |
| 59 |
=================================================================== |
| 60 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v |
| 61 |
retrieving revision 1.26 |
| 62 |
retrieving revision 1.27 |
| 63 |
diff -u -r1.26 -r1.27 |
| 64 |
--- ChangeLog 5 May 2012 08:56:07 -0000 1.26 |
| 65 |
+++ ChangeLog 1 Jul 2012 17:25:26 -0000 1.27 |
| 66 |
@@ -1,6 +1,11 @@ |
| 67 |
# ChangeLog for media-sound/xmms2 |
| 68 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 69 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.26 2012/05/05 08:56:07 mgorny Exp $ |
| 70 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.27 2012/07/01 17:25:26 slyfox Exp $ |
| 71 |
+ |
| 72 |
+ 01 Jul 2012; Sergei Trofimovich <slyfox@g.o> xmms2-0.8-r1.ebuild: |
| 73 |
+ Workaround build failure when test failure occurs. Rerun tests in src_test(). |
| 74 |
+ It moves valgrind misconfiguration error to src_test() phase (bug #424377 by |
| 75 |
+ Diego Elio Pettenò). |
| 76 |
|
| 77 |
05 May 2012; Michał Górny <mgorny@g.o> xmms2-0.7-r2.ebuild, |
| 78 |
xmms2-0.7-r3.ebuild, xmms2-0.8-r1.ebuild: |
Archives