From: Elias Pipping <pipping@macports.org>
Date: Fri, 23 Mar 2007 00:42:06 GMT
Subject: [SOLVED] Testsuite fails (t4118) with sed != gnu sed (was: [PATCH] t4118: be nice to non-GNU sed)
Message-ID: <AC2E511A-04FB-4F18-93E3-8D81C6E379FF@macports.org>
In-Reply-To: <Pine.LNX.4.63.0703230117200.4045@wbgn013.biozentrum.uni-wuerzburg.de>

Hi,

I'm on a mac, hence /usr/bin/sed is not gnu sed, which makes t4118 fail.

This patch by Johannes Schindelin (Johannes.Schindelin@gmx.de) solves  
the issue for me, though.


Regards,

Elias Pipping


Begin forwarded message:

> From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> Date: March 23, 2007 1:17:35 AM GMT+01:00
> To: pipping@macports.org
> Subject: [PATCH] t4118: be nice to non-GNU sed
>
>
> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
>
> ---
>
>  t/t4118-apply-empty-context.sh |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty- 
> context.sh
> index 690a182..27cc6f2 100755
> --- a/t/t4118-apply-empty-context.sh
> +++ b/t/t4118-apply-empty-context.sh
> @@ -23,7 +23,8 @@ test_expect_success setup '
>  	cat file2 >file2.orig
>  	git add file1 file2 &&
>  	sed -e "/^B/d" <file1.orig >file1 &&
> -	sed -e "/^B/d" <file2.orig >file2 &&
> +	sed -e "/^[BQ]/d" <file2.orig >file2 &&
> +	echo Q | tr -d "\\012" >>file2 &&
>  	cat file1 >file1.mods &&
>  	cat file2 >file2.mods &&
>  	git diff |