diff --git a/util/fetch-gnu.sh b/util/fetch-gnu.sh index f5bfc167bea..8a30184f5f2 100755 --- a/util/fetch-gnu.sh +++ b/util/fetch-gnu.sh @@ -1,16 +1,12 @@ #!/bin/bash -e -ver="9.10" +ver="9.11" repo=https://github.com/coreutils/coreutils curl -L "${repo}/releases/download/v${ver}/coreutils-${ver}.tar.xz" | tar --strip-components=1 -xJf - # TODO stop backporting tests from master at GNU coreutils > $ver - backport=( - misc/coreutils.sh # enable test - tee/tee.sh # input containing sleep - misc/yes.sh # zero-copy +exit 0 +backport=( ) for f in "${backport[@]}" do curl -L ${repo}/raw/refs/heads/master/tests/$f > tests/$f done -# adjust for getlimits > $ver -sed -i.b "s/\$ENOSPC/No space left on device/" tests/misc/yes.sh diff --git a/util/gnu-patches/series b/util/gnu-patches/series index 973dce8b2bc..f3956132343 100644 --- a/util/gnu-patches/series +++ b/util/gnu-patches/series @@ -1,7 +1,7 @@ tests_factor_factor.pl.patch tests_cksum_base64.patch tests_comm.pl.patch -tests_cut_error_msg.patch +# FIXME: tests_cut_error_msg.patch tests_dup_source.patch tests_env_env-S.pl.patch tests_invalid_opt.patch diff --git a/util/gnu-patches/tests_cut_error_msg.patch b/util/gnu-patches/tests_cut_error_msg.patch index a3cea317b51..a3213ef44a4 100644 --- a/util/gnu-patches/tests_cut_error_msg.patch +++ b/util/gnu-patches/tests_cut_error_msg.patch @@ -11,6 +11,7 @@ Index: gnu/tests/cut/cut.pl -my $inval_fld = "$prog: invalid field range\n$try"; -my $inval_pos = "$prog: invalid byte or character range\n$try"; -my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try"; +-my $one_list = "$prog: only one list may be specified\n$try"; -my $nofield = "$prog: an input delimiter may be specified only when " . - "operating on fields\n$try"; +my $from_field1 = "$prog: range '' was invalid: failed to parse range\n"; @@ -21,6 +22,7 @@ Index: gnu/tests/cut/cut.pl +my $inval_fld = "$prog: range '--' was invalid: failed to parse range\n"; +my $inval_pos = "$prog: range '--' was invalid: failed to parse range\n"; +my $no_endpoint = "$prog: range '-' was invalid: invalid range with no endpoint\n"; ++my $one_list = "$prog: only one list may be specified\n$try"; +my $nofield = "$prog: invalid input: The '--delimiter' ('-d') option can only be used when printing a sequence of fields\n"; my @Tests =