Skip to contentSkip to conversation

Make t2024 NO_PERL-safe

PATCH In review Johannes Schindelin via GitGitGadget 3 participants 4 messages Aug 23, 2018 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Johannes Schindelin via GitGitGadget

author
#1 lore raw

v2 cover Make t2024 NO_PERL-safe

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.

Signature · 1 line
gitgitgadget
author
#2 lore raw

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

From: Johannes Schindelin <[email protected]>

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 <[email protected]>
---
 t/t2024-checkout-dwim.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
t/t2024-checkout-dwim.sh +2 -1
index 26dc3f1fc0..29e1e25300 100755
@@ -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 &&
Signature · 1 line
gitgitgadget
#3 lore raw

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

Quoted 21 lines · Johannes Schindelin via GitGitGadget

From: Johannes Schindelin <[email protected]>

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 <[email protected]>
---
 t/t2024-checkout-dwim.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
t/t2024-checkout-dwim.sh +0 -0
index 26dc3f1fc0..29e1e25300 100755

t/t2024-checkout-dwim.sh test_expect_success 'checkout of branch from multiple remotes fails #1' ' · line 83

Quoted 9 lines
t/t2024-checkout-dwim.sh +2 -1
@@ -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).

#4 lore raw

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

Hi Ævar,

Quoted 27 lines · Ævar Arnfjörð Bjarmason
Quoted 24 lines · Johannes Schindelin via GitGitGadget

From: Johannes Schindelin <[email protected]>

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 <[email protected]>
---
 t/t2024-checkout-dwim.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
t/t2024-checkout-dwim.sh +0 -0
index 26dc3f1fc0..29e1e25300 100755
@@ -76,7 +76,8 @@ test_expect_success 'checkout of branch from multiple remotes fails #1' '
 	test_branch master
 '
Quoted 9 lines

t/t2024-checkout-dwim.sh test_expect_success 'checkout of branch from multiple remotes fails #1' ' · line 83

Quoted 6 lines
t/t2024-checkout-dwim.sh +2 -1
-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