diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2012-10-02 08:14:36 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-10-02 08:14:36 +0000 |
| commit | bde491144365a5608482a68afbcb0c698e72a8ee (patch) | |
| tree | b181627460e2548b70c7f39a1ae02328e4cd0ca4 /eclass/cmake-utils.eclass | |
| parent | Version bump mercurial to 2.3.2. (diff) | |
| download | gentoo-2-bde491144365a5608482a68afbcb0c698e72a8ee.tar.gz gentoo-2-bde491144365a5608482a68afbcb0c698e72a8ee.tar.bz2 gentoo-2-bde491144365a5608482a68afbcb0c698e72a8ee.zip | |
Make VIRTUALX_COMMAND nonfatal so that Xvfb is always killed. Return status at the end of CMake test phase. This fixes bug #406353.
Diffstat (limited to 'eclass/cmake-utils.eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 9 |
1 files changed, 7 insertions, 2 deletions
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 |