git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 0/1] Make t2024 NO_PERL-safe
       [not found] <pull.20.git.gitgitgadget@gmail.com>
@ 2018-08-23 14:41 ` Johannes Schindelin via GitGitGadget
  2018-08-23 14:41   ` [PATCH v2 1/1] t2024: mark a `checkout -p` test as requiring Perl Johannes Schindelin via GitGitGadget
  0 siblings, 1 reply; 4+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2018-08-23 14:41 UTC (permalink / raw)
  To: git; +Cc: AEvar Bjarmason, Junio C Hamano

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH v2 1/1] t2024: mark a `checkout -p` test as requiring Perl
  2018-08-23 14:41 ` [PATCH v2 0/1] Make t2024 NO_PERL-safe Johannes Schindelin via GitGitGadget
@ 2018-08-23 14:41   ` Johannes Schindelin via GitGitGadget
  2018-08-23 15:00     ` Ævar Arnfjörð Bjarmason
  0 siblings, 1 reply; 4+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2018-08-23 14:41 UTC (permalink / raw)
  To: git; +Cc: AEvar Bjarmason, Junio C Hamano, Johannes Schindelin

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 &&
-- 
gitgitgadget

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v2 1/1] t2024: mark a `checkout -p` test as requiring Perl
  2018-08-23 14:41   ` [PATCH v2 1/1] t2024: mark a `checkout -p` test as requiring Perl Johannes Schindelin via GitGitGadget
@ 2018-08-23 15:00     ` Ævar Arnfjörð Bjarmason
  2018-08-23 20:59       ` Johannes Schindelin
  0 siblings, 1 reply; 4+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2018-08-23 15:00 UTC (permalink / raw)
  To: Johannes Schindelin via GitGitGadget
  Cc: git, Junio C Hamano, Johannes Schindelin


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).

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2 1/1] t2024: mark a `checkout -p` test as requiring Perl
  2018-08-23 15:00     ` Ævar Arnfjörð Bjarmason
@ 2018-08-23 20:59       ` Johannes Schindelin
  0 siblings, 0 replies; 4+ messages in thread
From: Johannes Schindelin @ 2018-08-23 20:59 UTC (permalink / raw)
  To: Ævar Arnfjörð Bjarmason
  Cc: Johannes Schindelin via GitGitGadget, git, Junio C Hamano

[-- Attachment #1: Type: text/plain, Size: 1573 bytes --]

Hi Ævar,

On Thu, 23 Aug 2018, Ævar Arnfjörð Bjarmason wrote:

> 
> 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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-08-23 20:59 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <pull.20.git.gitgitgadget@gmail.com>
2018-08-23 14:41 ` [PATCH v2 0/1] Make t2024 NO_PERL-safe Johannes Schindelin via GitGitGadget
2018-08-23 14:41   ` [PATCH v2 1/1] t2024: mark a `checkout -p` test as requiring Perl Johannes Schindelin via GitGitGadget
2018-08-23 15:00     ` Ævar Arnfjörð Bjarmason
2018-08-23 20:59       ` Johannes Schindelin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).