threads / patch / 27268

patchFix test t3701-add-interactive.sh

Subject: [PATCH] Fix test t3701-add-interactive.sh

## tl;dr

3 messages between May 5, 2011 and May 5, 2011. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Kacper Kornet· May 5, 2011, 16:50 UTC · lore

One of the tests used to fail due to EOF not in the first column and not continued &&.

Signed-off-by: Kacper Kornet <draenog@pld-linux.org>
---
 t/t3701-add-interactive.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Show changes to t/t3701-add-interactive.sh +2 −2

diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index d6327e7..018f5d9 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -83,9 +83,9 @@ EOF
 
 test_expect_success PERL 'setup fake editor' '
 	cat >fake_editor.sh <<EOF
-	EOF
+EOF
 	chmod a+x fake_editor.sh &&
-	test_set_editor "$(pwd)/fake_editor.sh" &&
+	test_set_editor "$(pwd)/fake_editor.sh"
 '
 
 test_expect_success PERL 'dummy edit works' '

-- 
1.7.5

-- 
  Kacper Kornet

Junio C Hamano· May 5, 2011, 18:27 UTC · re: Kacper Kornet · lore

Re: [PATCH] Fix test t3701-add-interactive.sh

Kacper Kornet <draenog@pld-linux.org> writes:

Show 22 quoted lines

> One of the tests used to fail due to EOF not in the first column and not
> continued &&.
>
> Signed-off-by: Kacper Kornet <draenog@pld-linux.org>
> ---
>  t/t3701-add-interactive.sh |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
> index d6327e7..018f5d9 100755
> --- a/t/t3701-add-interactive.sh
> +++ b/t/t3701-add-interactive.sh
> @@ -83,9 +83,9 @@ EOF
>  
>  test_expect_success PERL 'setup fake editor' '
>  	cat >fake_editor.sh <<EOF
> -	EOF
> +EOF
>  	chmod a+x fake_editor.sh &&
> -	test_set_editor "$(pwd)/fake_editor.sh" &&
> +	test_set_editor "$(pwd)/fake_editor.sh"
>  '

Very curious. I never saw the breakage.  We are getting:

./test-lib.sh: line 450: warning: here-document at line 447 delimited by end-of-file (wanted `EOF')

Well spotted.  Thanks.

Kacper Kornet· May 5, 2011, 18:53 UTC · re: Junio C Hamano · lore

Re: [PATCH] Fix test t3701-add-interactive.sh

On Thu, May 05, 2011 at 11:27:17AM -0700, Junio C Hamano wrote:

> Kacper Kornet <draenog@pld-linux.org> writes:

> > One of the tests used to fail due to EOF not in the first column and not
> > continued &&.

> > Signed-off-by: Kacper Kornet <draenog@pld-linux.org>
> > ---
> >  t/t3701-add-interactive.sh |    4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)

Show 5 quoted lines

> > diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
> > index d6327e7..018f5d9 100755
> > --- a/t/t3701-add-interactive.sh
> > +++ b/t/t3701-add-interactive.sh
> > @@ -83,9 +83,9 @@ EOF

Show 8 quoted lines

> >  test_expect_success PERL 'setup fake editor' '
> >  	cat >fake_editor.sh <<EOF
> > -	EOF
> > +EOF
> >  	chmod a+x fake_editor.sh &&
> > -	test_set_editor "$(pwd)/fake_editor.sh" &&
> > +	test_set_editor "$(pwd)/fake_editor.sh"
> >  '

> Very curious. I never saw the breakage.  We are getting:

It is probably we are using a different shell as /bin/sh.

> Well spotted.  Thanks.

By the way. The credit shoud probably go to qboosh@pld-linux.org. I have just rediscovered it in my private build.

-- 
  Kacper Kornet