From cda918b2f180044814141aaf6b2e0a8f72eb3b33 Mon Sep 17 00:00:00 2001
From: oech3 <>
Date: Fri, 12 Dec 2025 21:12:51 +0900
Subject: [PATCH] GnuTests: Reduce GNU deps on BSD

---
 util/build-gnu.sh    | 10 +++++-----
 util/run-gnu-test.sh | 21 +++++++--------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/util/build-gnu.sh b/util/build-gnu.sh
index 626400d6a57..33b172fa06d 100755
--- a/util/build-gnu.sh
+++ b/util/build-gnu.sh
@@ -3,16 +3,15 @@
 #
 
 # spell-checker:ignore (paths) abmon deref discrim eacces getlimits getopt ginstall inacc infloop inotify reflink ; (misc) INT_OFLOW OFLOW
-# spell-checker:ignore baddecode submodules xstrtol distros ; (vars/env) SRCDIR vdir rcexp xpart dired OSTYPE ; (utils) gnproc greadlink gsed multihardlink texinfo CARGOFLAGS
+# spell-checker:ignore baddecode submodules xstrtol distros ; (vars/env) SRCDIR vdir rcexp xpart dired OSTYPE ; (utils) greadlink gsed multihardlink texinfo CARGOFLAGS
 # spell-checker:ignore openat TOCTOU CFLAGS
 # spell-checker:ignore hfsplus casefold chattr
 
 set -e
 
-# Use system's GNU version for make, nproc, readlink and sed on *BSD and macOS
+# Use GNU make, readlink and sed on *BSD and macOS
 MAKE=$(command -v gmake||command -v make)
-NPROC=$(command -v gnproc||command -v nproc)
-READLINK=$(command -v greadlink||command -v readlink)
+READLINK=$(command -v greadlink||command -v readlink) # Use our readlink to remove a dependency
 SED=$(command -v gsed||command -v sed)
 
 SYSTEM_TIMEOUT=$(command -v timeout)
@@ -141,7 +140,8 @@ else
     "${SED}" -i 's|^"\$@|'"${SYSTEM_TIMEOUT}"' 600 "\$@|' build-aux/test-driver
     # Use a better diff
     "${SED}" -i 's|diff -c|diff -u|g' tests/Coreutils.pm
-    "${MAKE}" -j "$("${NPROC}")"
+    # Use our nproc for *BSD and macOS
+    "${MAKE}" -j "$("${UU_BUILD_DIR}/nproc")"
 
     # Handle generated factor tests
     t_first=00
diff --git a/util/run-gnu-test.sh b/util/run-gnu-test.sh
index 43eb25f66c5..febf5e8313a 100755
--- a/util/run-gnu-test.sh
+++ b/util/run-gnu-test.sh
@@ -2,24 +2,14 @@
 # `run-gnu-test.bash [TEST]`
 # run GNU test (or all tests if TEST is missing/null)
 
-# spell-checker:ignore (env/vars) GNULIB SRCDIR SUBDIRS OSTYPE ; (utils) shellcheck gnproc greadlink
+# spell-checker:ignore (env/vars) GNULIB SRCDIR SUBDIRS OSTYPE ; (utils) shellcheck greadlink
 
 # ref: [How the GNU coreutils are tested](https://www.pixelbeat.org/docs/coreutils-testing.html) @@ <https://archive.is/p2ITW>
 # * note: to run a single test => `make check TESTS=PATH/TO/TEST/SCRIPT SUBDIRS=. VERBOSE=yes`
 
-# Use GNU version for make, nproc, readlink on *BSD
-case "$OSTYPE" in
-    *bsd*)
-        MAKE="gmake"
-        NPROC="gnproc"
-        READLINK="greadlink"
-        ;;
-    *)
-        MAKE="make"
-        NPROC="nproc"
-        READLINK="readlink"
-        ;;
-esac
+# Use GNU make, readlink on *BSD
+MAKE=$(command -v gmake||command -v make)
+READLINK=$(command -v greadlink||command -v readlink) # Use our readlink to remove a dependency
 
 ME_dir="$(dirname -- "$("${READLINK}" -fm -- "$0")")"
 REPO_main_dir="$(dirname -- "${ME_dir}")"
@@ -37,6 +27,9 @@ path_GNU="$("${READLINK}" -fm -- "${path_GNU:-${path_UUTILS}/../gnu}")"
 echo "path_UUTILS='${path_UUTILS}'"
 echo "path_GNU='${path_GNU}'"
 
+# Use our nproc for *BSD
+NPROC="${path_UUTILS}/nproc"
+
 ###
 
 cd "${path_GNU}" && echo "[ pwd:'${PWD}' ]"