From d5e060a2d9ae439620689acc720d9a11a859a3a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 17 May 2024 15:09:44 +0200 Subject: python-utils-r1.eclass: Fix cleanup in failing epytest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix epytest to call `die -n` after performing the cleanup, rather than before. This ensures that stray cache files are cleaned up even if we're actually going to die, e.g. when using `FEATURES=test-fail-continue`. Signed-off-by: Michał Górny Closes: https://github.com/gentoo/gentoo/pull/36672 Signed-off-by: Michał Górny --- eclass/python-utils-r1.eclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'eclass/python-utils-r1.eclass') diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 584ed831f816..c47565fa1db2 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1444,7 +1444,7 @@ epytest() { set -- "${EPYTHON}" -m pytest "${args[@]}" "${@}" ${EPYTEST_FLAGS} echo "${@}" >&2 - "${@}" || die -n "pytest failed with ${EPYTHON}" + "${@}" local ret=${?} # remove common temporary directories left over by pytest plugins @@ -1455,6 +1455,7 @@ epytest() { find "${BUILD_DIR}" -name '*-pytest-*.pyc' -delete || die fi + [[ ${ret} -ne 0 ]] && die -n "pytest failed with ${EPYTHON}" return ${ret} } -- cgit v1.2.3