diff options
| author |   Andreas Hüttel <dilfridge@gentoo.org> | 2011-08-21 21:19:08 +0000 |
|---|---|---|
| committer | Andreas Hüttel <dilfridge@gentoo.org> | 2011-08-21 21:19:08 +0000 |
| commit | b27d28cff4d829943809a2676ff24c855094c32a (patch) | |
| tree | 337cc55fb8c9620421b6f1caf44de60b075c9a68 /eclass/cmake-utils.eclass | |
| parent | Introduce the first ebuild for tinynotify-send. (diff) | |
| download | historical-b27d28cff4d829943809a2676ff24c855094c32a.tar.gz historical-b27d28cff4d829943809a2676ff24c855094c32a.tar.bz2 historical-b27d28cff4d829943809a2676ff24c855094c32a.zip | |
Add undocumented variable such that in case of test failures the test log is
inserted into the build log. On request from Diego.
Diffstat (limited to 'eclass/cmake-utils.eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index db9e48913d0a..c903f9167a38 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.71 2011/08/20 21:43:25 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.72 2011/08/21 21:19:08 dilfridge Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -439,7 +439,21 @@ enable_cmake-utils_src_test() { [[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; } [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - ctest ${ctestargs} "$@" || die "Tests failed. When you file a bug, please attach the following file: \n\t${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log" + + if ctest ${ctestargs} "$@" ; then + einfo "Tests succeeded." + else + if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then + # on request from Diego + eerror "Tests failed. Test log ${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log follows:" + eerror "--START TEST LOG--------------------------------------------------------------" + cat "${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log" + eerror "--END TEST LOG----------------------------------------------------------------" + die "Tests failed." + else + die "Tests failed. When you file a bug, please attach the following file: \n\t${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log" + fi + fi popd > /dev/null } |