diff options
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/cmake-utils.eclass | 9 | ||||
| -rw-r--r-- | eclass/virtualx.eclass | 4 |
3 files changed, 15 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 6eff4571420e..2e32936e7994 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.423 2012/10/02 01:22:57 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.424 2012/10/02 08:14:36 kensington Exp $ + + 02 Oct 2012; Michael Palimaka <kensington@gentoo.org> cmake-utils.eclass, + virtualx.eclass: + Make VIRTUALX_COMMAND nonfatal so that Xvfb is always killed. Return status + at the end of CMake test phase. This fixes bug #406353. 02 Oct 2012; Mike Gilbert <floppym@gentoo.org> python.eclass: Add 3.3 as a supported python abi for testing. diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index ae34738c01ba..f0bc23ac5ca7 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -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/eclass/cmake-utils.eclass,v 1.82 2012/09/27 16:35:41 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.83 2012/10/02 08:14:36 kensington Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -472,6 +472,8 @@ enable_cmake-utils_src_test() { if ctest ${ctestargs} "$@" ; then einfo "Tests succeeded." + popd > /dev/null + return 0 else if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then # on request from Diego @@ -483,8 +485,11 @@ enable_cmake-utils_src_test() { else die "Tests failed. When you file a bug, please attach the following file: \n\t${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log" fi + + # die might not die due to nonfatal + popd > /dev/null + return 1 fi - popd > /dev/null } # @FUNCTION: cmake-utils_src_configure diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 2a1b4a8aa3a2..ff7be80f848d 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -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/eclass/virtualx.eclass,v 1.41 2012/09/29 20:48:58 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.42 2012/10/02 08:14:36 kensington Exp $ # @ECLASS: virtualx.eclass # @MAINTAINER: @@ -144,7 +144,7 @@ virtualmake() { # Do not break on error, but setup $retval, as we need # to kill Xvfb debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\"" - ${VIRTUALX_COMMAND} "$@" + nonfatal ${VIRTUALX_COMMAND} "$@" retval=$? # Now kill Xvfb |