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' \