diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2012-10-02 18:16:30 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-10-02 18:17:05 +1000 |
| commit | 3a3dbce18a5d2d7188064e6edbe1b5e14c75dad3 (patch) | |
| tree | d2b357c64ac5915f0fe954d9b2afead0ab53a59f /eclass | |
| parent | 98fcf0a2c6b1424c3ca557db0235ccb5e60cb9ed (diff) | |
| download | kde-3a3dbce18a5d2d7188064e6edbe1b5e14c75dad3.tar.gz kde-3a3dbce18a5d2d7188064e6edbe1b5e14c75dad3.tar.bz2 kde-3a3dbce18a5d2d7188064e6edbe1b5e14c75dad3.zip | |
[eclass] Return status at the end of CMake test phase. This fixes bug #406353.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index fff3fba512a..2463bc5098c 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -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 |