From d445edfd196e79e40b07bfc093d05bc79f5f4645 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 13 Jan 2025 10:15:33 +0100 Subject: [PATCH 1/3] GNU build: disable an old check --- util/build-gnu.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index d29283a69b1..b1daee7e6bc 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -122,6 +122,8 @@ if test -f gnu-built; then echo "'rm -f $(pwd)/gnu-built' to force the build" echo "Note: the customization of the tests will still happen" else + # Disable useless checks + sed -i 's|check-texinfo: $(syntax_checks)|check-texinfo:|' doc/local.mk ./bootstrap --skip-po ./configure --quiet --disable-gcc-warnings --disable-nls --disable-dependency-tracking --disable-bold-man-page-references #Add timeout to to protect against hangs From 7f0d77954d17827dccdfee25a4364c3851066e03 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 13 Jan 2025 10:15:50 +0100 Subject: [PATCH 2/3] GNU build: perf the change only once --- util/build-gnu.sh | 82 +++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index b1daee7e6bc..a8b85f29661 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -134,51 +134,51 @@ else # Use a better diff sed -i 's|diff -c|diff -u|g' tests/Coreutils.pm "${MAKE}" -j "$("${NPROC}")" - touch gnu-built -fi -# Handle generated factor tests -t_first=00 -t_max=36 -# t_max_release=20 -# if test "${UU_MAKE_PROFILE}" != "debug"; then -# # Generate the factor tests, so they can be fixed -# # * reduced to 20 to decrease log size (down from 36 expected by GNU) -# # * only for 'release', skipped for 'debug' as redundant and too time consuming (causing timeout errors) -# seq=$( -# i=${t_first} -# while test "${i}" -le "${t_max_release}"; do -# printf '%02d ' $i -# i=$((i + 1)) -# done -# ) -# for i in ${seq}; do -# "${MAKE}" "tests/factor/t${i}.sh" -# done -# cat -# sed -i -e 's|^seq |/usr/bin/seq |' -e 's|sha1sum |/usr/bin/sha1sum |' tests/factor/t*.sh -# t_first=$((t_max_release + 1)) -# fi -# strip all (debug) or just the longer (release) factor tests from Makefile -seq=$( - i=${t_first} - while test "${i}" -le "${t_max}"; do - printf '%02d ' ${i} - i=$((i + 1)) + # Handle generated factor tests + t_first=00 + t_max=36 + # t_max_release=20 + # if test "${UU_MAKE_PROFILE}" != "debug"; then + # # Generate the factor tests, so they can be fixed + # # * reduced to 20 to decrease log size (down from 36 expected by GNU) + # # * only for 'release', skipped for 'debug' as redundant and too time consuming (causing timeout errors) + # seq=$( + # i=${t_first} + # while test "${i}" -le "${t_max_release}"; do + # printf '%02d ' $i + # i=$((i + 1)) + # done + # ) + # for i in ${seq}; do + # "${MAKE}" "tests/factor/t${i}.sh" + # done + # cat + # sed -i -e 's|^seq |/usr/bin/seq |' -e 's|sha1sum |/usr/bin/sha1sum |' tests/factor/t*.sh + # t_first=$((t_max_release + 1)) + # fi + # strip all (debug) or just the longer (release) factor tests from Makefile + seq=$( + i=${t_first} + while test "${i}" -le "${t_max}"; do + printf '%02d ' ${i} + i=$((i + 1)) + done + ) + for i in ${seq}; do + echo "strip t${i}.sh from Makefile" + sed -i -e "s/\$(tf)\/t${i}.sh//g" Makefile done -) -for i in ${seq}; do - echo "strip t${i}.sh from Makefile" - sed -i -e "s/\$(tf)\/t${i}.sh//g" Makefile -done -grep -rl 'path_prepend_' tests/* | xargs sed -i 's| path_prepend_ ./src||' + # Remove tests checking for --version & --help + # Not really interesting for us and logs are too big + sed -i -e '/tests\/help\/help-version.sh/ D' \ + -e '/tests\/help\/help-version-getopt.sh/ D' \ + Makefile + touch gnu-built +fi -# Remove tests checking for --version & --help -# Not really interesting for us and logs are too big -sed -i -e '/tests\/help\/help-version.sh/ D' \ - -e '/tests\/help\/help-version-getopt.sh/ D' \ - Makefile +grep -rl 'path_prepend_' tests/* | xargs sed -i 's| path_prepend_ ./src||' # printf doesn't limit the values used in its arg, so this produced ~2GB of output sed -i '/INT_OFLOW/ D' tests/printf/printf.sh From 09ee3dc8ac872c200654c4e58b876e85ecbfc272 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Wed, 15 Jan 2025 09:43:37 +0100 Subject: [PATCH 3/3] GNU build: add word to spell-checker:ignore --- util/build-gnu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index a8b85f29661..782e21a1a30 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -2,7 +2,7 @@ # `build-gnu.bash` ~ builds GNU coreutils (from supplied sources) # -# spell-checker:ignore (paths) abmon deref discrim eacces getlimits getopt ginstall inacc infloop inotify reflink ; (misc) INT_OFLOW OFLOW baddecode submodules xstrtol ; (vars/env) SRCDIR vdir rcexp xpart dired OSTYPE ; (utils) gnproc greadlink gsed multihardlink +# spell-checker:ignore (paths) abmon deref discrim eacces getlimits getopt ginstall inacc infloop inotify reflink ; (misc) INT_OFLOW OFLOW baddecode submodules xstrtol ; (vars/env) SRCDIR vdir rcexp xpart dired OSTYPE ; (utils) gnproc greadlink gsed multihardlink texinfo set -e