summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-06-02 04:57:39 +0000
committerTim Harder <radhermit@gentoo.org>2012-06-02 04:57:39 +0000
commitd2ed492ad3a980e0255e1bf296d9e0bc113d01c8 (patch)
tree07963d3b556c23056e18f4bb67af458b8bd08501 /dev-libs/tinyxml2
parenthttp://my.opera.com/desktopteam/blog/2012/06/01/oopp-windows (diff)
downloadgentoo-2-d2ed492ad3a980e0255e1bf296d9e0bc113d01c8.tar.gz
gentoo-2-d2ed492ad3a980e0255e1bf296d9e0bc113d01c8.tar.bz2
gentoo-2-d2ed492ad3a980e0255e1bf296d9e0bc113d01c8.zip
Properly die if tests fail.
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/tinyxml2')
-rw-r--r--dev-libs/tinyxml2/ChangeLog7
-rw-r--r--dev-libs/tinyxml2/files/tinyxml2-1.0.1_p20120531-test-return-status.patch9
-rw-r--r--dev-libs/tinyxml2/tinyxml2-1.0.1_p20120531.ebuild9
3 files changed, 21 insertions, 4 deletions
diff --git a/dev-libs/tinyxml2/ChangeLog b/dev-libs/tinyxml2/ChangeLog
index b81227c56a2a..d9ffdef9daaa 100644
--- a/dev-libs/tinyxml2/ChangeLog
+++ b/dev-libs/tinyxml2/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/tinyxml2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml2/ChangeLog,v 1.1 2012/05/31 10:16:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml2/ChangeLog,v 1.2 2012/06/02 04:57:39 radhermit Exp $
+
+ 02 Jun 2012; Tim Harder <radhermit@gentoo.org>
+ tinyxml2-1.0.1_p20120531.ebuild,
+ +files/tinyxml2-1.0.1_p20120531-test-return-status.patch:
+ Properly die if tests fail.
*tinyxml2-1.0.1_p20120531 (31 May 2012)
diff --git a/dev-libs/tinyxml2/files/tinyxml2-1.0.1_p20120531-test-return-status.patch b/dev-libs/tinyxml2/files/tinyxml2-1.0.1_p20120531-test-return-status.patch
new file mode 100644
index 000000000000..49d7d8332e3b
--- /dev/null
+++ b/dev-libs/tinyxml2/files/tinyxml2-1.0.1_p20120531-test-return-status.patch
@@ -0,0 +1,9 @@
+--- tinyxml2-1.0.1_p20120531/xmltest.cpp
++++ tinyxml2-1.0.1_p20120531/xmltest.cpp
+@@ -895,5 +895,5 @@
+ #endif
+
+ printf ("\nPass %d, Fail %d\n", gPass, gFail);
+- return 0;
++ return gFail;
+ }
diff --git a/dev-libs/tinyxml2/tinyxml2-1.0.1_p20120531.ebuild b/dev-libs/tinyxml2/tinyxml2-1.0.1_p20120531.ebuild
index e7502588d959..13ae4ee02db7 100644
--- a/dev-libs/tinyxml2/tinyxml2-1.0.1_p20120531.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-1.0.1_p20120531.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/dev-libs/tinyxml2/tinyxml2-1.0.1_p20120531.ebuild,v 1.1 2012/05/31 10:16:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml2/tinyxml2-1.0.1_p20120531.ebuild,v 1.2 2012/06/02 04:57:39 radhermit Exp $
EAPI=4
@@ -15,7 +15,10 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="static-libs test"
-PATCHES=( "${FILESDIR}"/${P}-test.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-test.patch
+ "${FILESDIR}"/${P}-test-return-status.patch
+)
src_configure() {
local mycmakeargs=(
@@ -27,5 +30,5 @@ src_configure() {
src_test() {
cmake-utils_src_test
- ./test
+ ./test || die "Tests failed"
}