On Mon, Aug 30, 2021 at 07:41:56AM -0400, Theodore Ts'o wrote:
> This is needed to account for bash 5.1 adding line number annotation
> when a command like "bash -c /etc/passwd" fails, e.g., with
>
> bash: line 1: /etc/passwd: Permission denid
>
> instead of:
>
> bash: /etc/passwd: Permission denid
>
> Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
> ---
> common/filter | 11 +++++++++++
> tests/generic/572 | 33 +++++++++++++++++++--------------
> 2 files changed, 30 insertions(+), 14 deletions(-)
>
> diff --git a/common/filter b/common/filter
> index 2efbbd99..4b250e8b 100644
> --- a/common/filter
> +++ b/common/filter
> @@ -661,5 +661,16 @@ _filter_quota_report()
> s|^(.*?) (\d+) (\d+) (\d+)|$1 @{[$2 * 1024 /'$bsize']} @{[$3 * 1024 /'$bsize']} @{[$4 * 1024 /'$bsize']}|'
> }
>
> +#
> +# Bash 5.1+ adds "line 1: " when printing an error running an executable
> +# for example, "bash -c /etc/passwd" will result in the error
> +# "bash: line 1: /etc/passwd: Permission denied" where as earlier
> +# versions of bash will omit the "line 1: " annotation.
> +#
> +_filter_bash()
> +{
> + sed -e "s/^bash: line 1: /bash: /"
> +}
If this remains, it needs a much more specific name. "filter_bash"
could mean just about anything...
> # make sure this script returns success
> /bin/true
> diff --git a/tests/generic/572 b/tests/generic/572
> index f131c7ed..cded9ac6 100755
> --- a/tests/generic/572
> +++ b/tests/generic/572
> @@ -36,6 +36,11 @@ _scratch_mount
> fsv_orig_file=$SCRATCH_MNT/file
> fsv_file=$SCRATCH_MNT/file.fsv
>
> +filter_output()
> +{
> + _filter_bash | _filter_scratch
> +}
But given that this is only needed by a single test, why create
a generic "_filter_bash" function? Surely this could simply be:
filter_output()
{
sed -e "s/^bash: line 1: /bash: /" | _filter_scratch
}
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
