commit: 385f0c526a66fa7c3d0a23ea62cf260b188402ba Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Oct 1 19:36:20 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Oct 5 21:49:43 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=385f0c52
cmake.eclass: allow nonfatal cmake_src_test, fix pms violation 1) This is already expected in tree via virtx use. 2) Escape sequences are not allowed for `die`, use eerror instead. Bug: https://bugs.gentoo.org/961929 See also: https://github.com/gentoo/gentoo/pull/40307 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> (cherry picked from commit 657dc69cdd68546003b7877321bc1d2db0ddc849) (kde) (cherry picked from commit ae57eab324d55a4a0a6fb890d8039e53a7a8930a) (kde) eclass/cmake.eclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index e3f9a50a518d..37b181df927b 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -816,9 +816,11 @@ cmake_src_test() { eerror "--START TEST LOG--------------------------------------------------------------" cat "${BUILD_DIR}/Testing/Temporary/LastTest.log" eerror "--END TEST LOG----------------------------------------------------------------" - die "Tests failed." + die -n "Tests failed." else - die "Tests failed. When you file a bug, please attach the following file: \n\t${BUILD_DIR}/Testing/Temporary/LastTest.log" + eerror "Tests failed. When you file a bug, please attach the following file:" + eerror "\t${BUILD_DIR}/Testing/Temporary/LastTest.log" + die -n "Tests failed." fi # die might not die due to nonfatal
