From f0520b71c138926e43137e19e1c6ca5a32224992 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 16 Mar 2024 12:28:06 +0100 Subject: [PATCH 1/2] pr: relax some error messages Should make tests/pr/pr-tests.pl pass --- util/build-gnu.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 324f3ed68..c081386a4 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -249,6 +249,11 @@ test -f "${UU_BUILD_DIR}/getlimits" || cp src/getlimits "${UU_BUILD_DIR}" # SKIP for now sed -i -e "s|my \$prog = 'pr';$|my \$prog = 'pr';CuSkip::skip \"\$prog: SKIP for producing too long logs\";|" tests/pr/pr-tests.pl +# We don't have the same error message and no need to be that specific +sed -i -e "s|invalid suffix in --pages argument|invalid --pages argument|" \ + -e "s|--pages argument '\$too_big' too large|invalid --pages argument '\$too_big'|" \ + -e "s|invalid page range|invalid --pages argument|" tests/misc/xstrtol.pl + # When decoding an invalid base32/64 string, gnu writes everything it was able to decode until # it hit the decode error, while we don't write anything if the input is invalid. sed -i "s/\(baddecode.*OUT=>\"\).*\"/\1\"/g" tests/misc/base64.pl From b9ef78ad13a2f5cd008556cdb8df66176449421e Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Sat, 16 Mar 2024 16:54:03 +0100 Subject: [PATCH 2/2] build-gnu.sh: add xstrtol 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 c081386a4..906fbfae1 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 ; (vars/env) SRCDIR vdir rcexp xpart dired OSTYPE ; (utils) gnproc greadlink gsed +# 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 set -e