summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eclass/cmake-utils.eclass7
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