threads / patch / 49203

v2Make t2024 NO_PERL-safe

Subject: [PATCH v2 0/1] Make t2024 NO_PERL-safe

## tl;dr

4 messages between Aug 23, 2018 and Aug 23, 2018. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Johannes Schindelin via GitGitGadget· Aug 23, 2018, 14:41 UTC · lore

While trying to run the build & test with NO_PERL, I noticed that t2024 had a failing test case. This patch works around that failing test case by skipping it when we know that the error message looks different than that test case would expect.

Changes since v1 (which did not make it to the list due to https://github.com/gitgitgadget/gitgitgadget/issues/29):

 * reworded the commit message slightly.
Johannes Schindelin (1):
  t2024: mark a `checkout -p` test as requiring Perl
 t/t2024-checkout-dwim.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
base-commit: 8d7b558baebe3abbbad4973ce1e1f87a7da17f47
Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-20%2Fdscho%2Fcheckout-default-remote-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-20/dscho/checkout-default-remote-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/20
Range-diff vs v1:
 1:  619d7bcc31 ! 1:  8d46b31f5a t2024: mark a `checkout -p` test as requiring Perl
     @@ -3,9 +3,11 @@
          t2024: mark a `checkout -p` test as requiring Perl
      
          A recently-added test case tries to verify that the output of `checkout
     -    -p` contains a certain piece of advice. But if Git was built without
     -    Perl and therefore lacks support for `git add -i`, the error output
     -    contains the hint that `-p` is not even available instead.
     +    -p` contains a certain piece of advice.
     +
     +    But if Git was built without Perl and therefore lacks support for `git
     +    add -i`, the error output contains the hint that `-p` is not even
     +    available instead.
      
          Let's just skip that test case altogether if Git was built with NO_PERL.
      
-- 
gitgitgadget
Johannes Schindelin via GitGitGadget· Aug 23, 2018, 14:41 UTC · re: Johannes Schindelin via GitGitGadget · lore

[PATCH v2 1/1] t2024: mark a `checkout -p` test as requiring Perl

From: Johannes Schindelin <johannes.schindelin@gmx.de>

A recently-added test case tries to verify that the output of `checkout -p` contains a certain piece of advice.

But if Git was built without Perl and therefore lacks support for `git add -i`, the error output contains the hint that `-p` is not even available instead.

Let's just skip that test case altogether if Git was built with NO_PERL.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t2024-checkout-dwim.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Show changes to t/t2024-checkout-dwim.sh +2 −1
diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh
index 26dc3f1fc0..29e1e25300 100755
--- a/t/t2024-checkout-dwim.sh
+++ b/t/t2024-checkout-dwim.sh
@@ -76,7 +76,8 @@ test_expect_success 'checkout of branch from multiple remotes fails #1' '
 	test_branch master
 '
 
-test_expect_success 'checkout of branch from multiple remotes fails with advice' '
+test_expect_success NO_PERL \
+	'checkout of branch from multiple remotes fails with advice' '
 	git checkout -B master &&
 	test_might_fail git branch -D foo &&
 	test_must_fail git checkout foo 2>stderr &&

-- 
gitgitgadget
Ævar Arnfjörð Bjarmason· Aug 23, 2018, 15:00 UTC · re: Johannes Schindelin via GitGitGadget · lore

Re: [PATCH v2 1/1] t2024: mark a `checkout -p` test as requiring Perl

On Thu, Aug 23 2018, Johannes Schindelin via GitGitGadget wrote:
Show 30 quoted lines
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> A recently-added test case tries to verify that the output of `checkout
> -p` contains a certain piece of advice.
>
> But if Git was built without Perl and therefore lacks support for `git
> add -i`, the error output contains the hint that `-p` is not even
> available instead.
>
> Let's just skip that test case altogether if Git was built with NO_PERL.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>  t/t2024-checkout-dwim.sh | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh
> index 26dc3f1fc0..29e1e25300 100755
> --- a/t/t2024-checkout-dwim.sh
> +++ b/t/t2024-checkout-dwim.sh
> @@ -76,7 +76,8 @@ test_expect_success 'checkout of branch from multiple remotes fails #1' '
>  	test_branch master
>  '
>
> -test_expect_success 'checkout of branch from multiple remotes fails with advice' '
> +test_expect_success NO_PERL \
> +	'checkout of branch from multiple remotes fails with advice' '
>  	git checkout -B master &&
>  	test_might_fail git branch -D foo &&
>  	test_must_fail git checkout foo 2>stderr &&

This issue is already fixed in master as 3338e9950e ("t2024: mark test using "checkout -p" with PERL prerequisite", 2018-08-18).

Johannes Schindelin· Aug 23, 2018, 20:59 UTC · re: Ævar Arnfjörð Bjarmason · lore

Re: [PATCH v2 1/1] t2024: mark a `checkout -p` test as requiring Perl

Hi Ævar,
On Thu, 23 Aug 2018, Ævar Arnfjörð Bjarmason wrote:
Show 36 quoted lines
> 
> On Thu, Aug 23 2018, Johannes Schindelin via GitGitGadget wrote:
> 
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > A recently-added test case tries to verify that the output of `checkout
> > -p` contains a certain piece of advice.
> >
> > But if Git was built without Perl and therefore lacks support for `git
> > add -i`, the error output contains the hint that `-p` is not even
> > available instead.
> >
> > Let's just skip that test case altogether if Git was built with NO_PERL.
> >
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> >  t/t2024-checkout-dwim.sh | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh
> > index 26dc3f1fc0..29e1e25300 100755
> > --- a/t/t2024-checkout-dwim.sh
> > +++ b/t/t2024-checkout-dwim.sh
> > @@ -76,7 +76,8 @@ test_expect_success 'checkout of branch from multiple remotes fails #1' '
> >  	test_branch master
> >  '
> >
> > -test_expect_success 'checkout of branch from multiple remotes fails with advice' '
> > +test_expect_success NO_PERL \
> > +	'checkout of branch from multiple remotes fails with advice' '
> >  	git checkout -B master &&
> >  	test_might_fail git branch -D foo &&
> >  	test_must_fail git checkout foo 2>stderr &&
> 
> This issue is already fixed in master as 3338e9950e ("t2024: mark test
> using "checkout -p" with PERL prerequisite", 2018-08-18).

Excellent, Dscho

← back to recent threads