[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     3a3dbce18a5d2d7188064e6edbe1b5e14c75dad3
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  2 08:16:30 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct  2 08:17:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3a3dbce1

[eclass] Return status at the end of CMake test phase. This fixes bug #406353.

---
 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 fff3fba..2463bc5 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