Re: [PATCH 4/5] test-suite: Add -b option to ignore CR at eol on MinGW

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

 



On Tue, May 21, 2013 at 08:18:21PM +0100, Ramsay Jones wrote:
> Signed-off-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxx>

-b doesn't just ignore CR at end of line; it would also ignore changes
in the amount of whitespace elsewhere on the line.  You might consider
piping the input that has CRs through sed before storing it, to delete
the CR at end of line before comparing, instead.

> ---
>  validation/test-suite | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/validation/test-suite b/validation/test-suite
> index 3c011c6..ded93fc 100755
> --- a/validation/test-suite
> +++ b/validation/test-suite
> @@ -126,7 +126,7 @@ do_test()
>  	actual_exit_value=$?
>  
>  	for stream in output error; do
> -		diff -u "$file".$stream.expected "$file".$stream.got > "$file".$stream.diff
> +		diff -ub "$file".$stream.expected "$file".$stream.got > "$file".$stream.diff
>  		if [ "$?" -ne "0" ]; then
>  			error "actual $stream text does not match expected $stream text."
>  			error  "see $file.$stream.* for further investigation."
> -- 
> 1.8.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sparse" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-sparse" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Newbies FAQ]     [LKML]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Trinity Fuzzer Tool]

  Powered by Linux