Date: Mon, 01 Jun 2026 08:51:14 +0000 From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9a777e452788 - main - sysutils/rust-coreutils: fix unit tests Message-ID: <6a1d4802.32146.66533c20@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a777e4527887ccc29fdae6eef1c4d54cec1948d commit 9a777e4527887ccc29fdae6eef1c4d54cec1948d Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2026-06-01 08:49:38 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2026-06-01 08:51:09 +0000 sysutils/rust-coreutils: fix unit tests PR: 294424, 294597 Reported by: diizzy --- Mk/Uses/cargo.mk | 8 +++++++- sysutils/rust-coreutils/Makefile | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index 348bb186497b..fdbd31ec34cc 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -172,6 +172,7 @@ CARGO_BUILD_ARGS?= CARGO_INSTALL_ARGS?= CARGO_INSTALL_PATH?= . CARGO_TEST_ARGS?= +CARGO_TEST_AFTER_ARGS?= CARGO_UPDATE_ARGS?= # Use module targets ? @@ -364,13 +365,18 @@ do-install: . endfor . endif +. if !empty(CARGO_TEST_AFTER_ARGS) +_CARGO_TEST_AFTER_ARGS= -- ${CARGO_TEST_AFTER_ARGS} +. endif + . if !target(do-test) && ${CARGO_TEST:tl} == "yes" do-test: @${CARGO_CARGO_RUN} test \ --manifest-path ${CARGO_CARGOTOML} \ --verbose \ --verbose \ - ${CARGO_TEST_ARGS} + ${CARGO_TEST_ARGS} \ + ${_CARGO_TEST_AFTER_ARGS} . endif # diff --git a/sysutils/rust-coreutils/Makefile b/sysutils/rust-coreutils/Makefile index 4b83c790c510..027f49d48a8b 100644 --- a/sysutils/rust-coreutils/Makefile +++ b/sysutils/rust-coreutils/Makefile @@ -20,6 +20,11 @@ CARGO_FEATURES= unix BINPREFIX= uu- PLIST_SUB= BINPREFIX=${BINPREFIX} +# The French locale translation tests are flaky across distributions. +CARGO_TEST_AFTER_ARGS= --skip test_error_messages_french_translation \ + --skip test_french_colored_error_messages \ + --skip test_help_messages_french_translation + post-build: ${INSTALL_SCRIPT} ${FILESDIR}/symlink-install-helper.sh.in ${CARGO_TARGET_DIR}/symlink-install-helper.sh @${REINPLACE_CMD} -e 's|%%GREP%%|${GREP}|g' \home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a1d4802.32146.66533c20>