Re: [PATCH 24/27] t5004: ignore SIGPIPE in zipinfo

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Denton Liu <liu.denton@xxxxxxxxx> writes:

> In a future patch, we plan on running tests with `set -o pipefail`.
> Since zipinfo is killed by SIGPIPE, it will return an error code which

s/is killed/may be killed/ for the reasons I wrote for 23/27, I think.

Otherwise the idea behind the patch is good.

Thanks.

> will propogate as a result of the pipefail.
>
> Mask away the return code of zipinfo so that the failure as a result of
> the SIGPIPE does not propogate.
>
> Signed-off-by: Denton Liu <liu.denton@xxxxxxxxx>
> ---
>  t/t5004-archive-corner-cases.sh | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
> index 3e7b23cb32..4c6d42d474 100755
> --- a/t/t5004-archive-corner-cases.sh
> +++ b/t/t5004-archive-corner-cases.sh
> @@ -153,7 +153,9 @@ test_expect_success ZIPINFO 'zip archive with many entries' '
>  
>  	# check the number of entries in the ZIP file directory
>  	expr 65536 + 256 >expect &&
> -	"$ZIPINFO" many.zip | head -2 | sed -n "2s/.* //p" >actual &&
> +	{
> +		"$ZIPINFO" many.zip || :
> +	} | head -2 | sed -n "2s/.* //p" >actual &&
>  	test_cmp expect actual
>  '



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux