diff options
| author | Maciej Mrozowski <reavertm@gentoo.org> | 2010-07-06 04:00:21 +0200 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-07-06 04:02:20 +0200 |
| commit | 35112383b7ed2aa68ebf8c6e98444fde50b666b6 (patch) | |
| tree | 6bf1635c878d9e68e2d54e9528488e4670faf628 | |
| parent | e401f15b4537b4c41ac3e334ff78e0d523fb93b0 (diff) | |
| download | kde-35112383b7ed2aa68ebf8c6e98444fde50b666b6.tar.gz kde-35112383b7ed2aa68ebf8c6e98444fde50b666b6.tar.bz2 kde-35112383b7ed2aa68ebf8c6e98444fde50b666b6.zip | |
[eclass/cmake-utils] Respect TEST_VERBOSE, remove pushd/popd stderr redirection
| -rw-r--r-- | eclass/cmake-utils.eclass | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index afde5e54397..14ef85f1bbe 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -337,7 +337,6 @@ enable_cmake-utils_src_configure() { debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: mycmakeargs is ${mycmakeargs_local[*]}" echo cmake "${cmakeargs[@]}" "${CMAKE_USE_DIR}" cmake "${cmakeargs[@]}" "${CMAKE_USE_DIR}" || die "cmake failed" - popd > /dev/null } @@ -356,7 +355,7 @@ cmake-utils_src_make() { debug-print-function ${FUNCNAME} "$@" _check_build_dir - pushd "${CMAKE_BUILD_DIR}" &> /dev/null + pushd "${CMAKE_BUILD_DIR}" > /dev/null # first check if Makefile exist otherwise die [[ -e Makefile ]] || die "Makefile not found. Error during configure stage." if [[ -n ${CMAKE_VERBOSE} ]]; then @@ -364,16 +363,16 @@ cmake-utils_src_make() { else emake "$@" || die "Make failed!" fi - popd &> /dev/null + popd > /dev/null } enable_cmake-utils_src_install() { debug-print-function ${FUNCNAME} "$@" _check_build_dir - pushd "${CMAKE_BUILD_DIR}" &> /dev/null + pushd "${CMAKE_BUILD_DIR}" > /dev/null base_src_install - popd &> /dev/null + popd > /dev/null # Backward compatibility, for non-array variables if [[ -n "${DOCS}" ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then @@ -388,9 +387,11 @@ enable_cmake-utils_src_test() { debug-print-function ${FUNCNAME} "$@" _check_build_dir - pushd "${CMAKE_BUILD_DIR}" &> /dev/null - ctest --extra-verbose || die "Tests failed." - popd &> /dev/null + pushd "${CMAKE_BUILD_DIR}" > /dev/null + local ctestargs + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" + ctest ${ctestargs} || die "Tests failed." + popd > /dev/null } # @FUNCTION: cmake-utils_src_configure |