From e6669dcb27d32424315c543492686370f44ad4d9 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 13 Oct 2025 16:23:10 -0400 Subject: [PATCH] install-deps.sh: let FOR_MAKE_CHECK variable take precedence Previously, the FOR_MAKE_CHECK variable could only enable installing extra (test) dependencies when install-deps.sh was used and it was ignored if `tty -s` exited true. This change allows FOR_MAKE_CHECK to take precedence over the tty check and to specify one of true, 1, yes to enable extra "for make check" deps or false, 0, no to explicitly disable the extra deps. Based-on-work-by: Dan Mick Signed-off-by: John Mulligan (cherry picked from commit 503ec0c294c49a32d958e6e5a093efc6c8f92434) --- install-deps.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index 555c3cf8449..261d0fb90f2 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -320,13 +320,22 @@ function preload_wheels_for_tox() { } for_make_check=false -if tty -s; then +if [ "$FOR_MAKE_CHECK" ]; then + case "$FOR_MAKE_CHECK" in + true|1|yes) + for_make_check=true + ;; + false|0|no) + for_make_check=false + ;; + *) + echo "error: unexpected FOR_MAKE_CHECK value: ${FOR_MAKE_CHECK}" + exit 2 + ;; + esac +elif tty -s; then # interactive for_make_check=true -elif [ $FOR_MAKE_CHECK ]; then - for_make_check=true -else - for_make_check=false fi if [ x$(uname)x = xFreeBSDx ]; then -- 2.39.5