From 3222c9225c5fc6df232ea2859da3226ed16f14b3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 28 Mar 2024 18:23:59 +0100 Subject: [PATCH 1/2] upgrade to GNU coreutils 9.5 as ref --- .github/workflows/GnuTests.yml | 4 ++-- util/build-gnu.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/GnuTests.yml b/.github/workflows/GnuTests.yml index 6a4676a7913..eefba654c96 100644 --- a/.github/workflows/GnuTests.yml +++ b/.github/workflows/GnuTests.yml @@ -46,7 +46,7 @@ jobs: outputs path_GNU path_GNU_tests path_reference path_UUTILS # repo_default_branch="${{ github.event.repository.default_branch }}" - repo_GNU_ref="v9.4" + repo_GNU_ref="v9.5" repo_reference_branch="${{ github.event.repository.default_branch }}" outputs repo_default_branch repo_GNU_ref repo_reference_branch # @@ -344,7 +344,7 @@ jobs: with: repository: 'coreutils/coreutils' path: 'gnu' - ref: 'v9.4' + ref: 'v9.5' submodules: recursive - uses: dtolnay/rust-toolchain@master with: diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 876e645faed..c1853f765c0 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -60,7 +60,7 @@ fi ### -release_tag_GNU="v9.4" +release_tag_GNU="v9.5" if test ! -d "${path_GNU}"; then echo "Could not find GNU coreutils (expected at '${path_GNU}')" From d535095d0f5ef340022b3b6581642f9fe302bad8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 28 Mar 2024 21:10:09 +0100 Subject: [PATCH 2/2] build-gnu.sh: adjust of some of the path --- util/build-gnu.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index c1853f765c0..6a4b09f89d8 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -258,15 +258,15 @@ sed -i -e "s|invalid suffix in --pages argument|invalid --pages argument|" \ # 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 -sed -i "s/\(\(b2[ml]_[69]\|b32h_[56]\|z85_8\|z85_35\).*OUT=>\)[^}]*\(.*\)/\1\"\"\3/g" tests/misc/basenc.pl +sed -i "s/\(baddecode.*OUT=>\"\).*\"/\1\"/g" tests/basenc/base64.pl +sed -i "s/\(\(b2[ml]_[69]\|b32h_[56]\|z85_8\|z85_35\).*OUT=>\)[^}]*\(.*\)/\1\"\"\3/g" tests/basenc/basenc.pl # add "error: " to the expected error message -sed -i "s/\$prog: invalid input/\$prog: error: invalid input/g" tests/misc/basenc.pl +sed -i "s/\$prog: invalid input/\$prog: error: invalid input/g" tests/basenc/basenc.pl # basenc: swap out error message for unexpected arg -sed -i "s/ {ERR=>\"\$prog: foobar\\\\n\" \. \$try_help }/ {ERR=>\"error: Found argument '--foobar' which wasn't expected, or isn't valid in this context\n\n If you tried to supply '--foobar' as a value rather than a flag, use '-- --foobar'\n\nUsage: basenc [OPTION]... [FILE]\n\nFor more information try '--help'\n\"}]/" tests/misc/basenc.pl -sed -i "s/ {ERR_SUBST=>\"s\/(unrecognized|unknown) option \[-' \]\*foobar\[' \]\*\/foobar\/\"}],//" tests/misc/basenc.pl +sed -i "s/ {ERR=>\"\$prog: foobar\\\\n\" \. \$try_help }/ {ERR=>\"error: Found argument '--foobar' which wasn't expected, or isn't valid in this context\n\n If you tried to supply '--foobar' as a value rather than a flag, use '-- --foobar'\n\nUsage: basenc [OPTION]... [FILE]\n\nFor more information try '--help'\n\"}]/" tests/basenc/basenc.pl +sed -i "s/ {ERR_SUBST=>\"s\/(unrecognized|unknown) option \[-' \]\*foobar\[' \]\*\/foobar\/\"}],//" tests/basenc/basenc.pl # Remove the check whether a util was built. Otherwise tests against utils like "arch" are not run. sed -i "s|require_built_ |# require_built_ |g" init.cfg