Skip to content

Commit 5f8af25

Browse files
pks-tttaylorr
authored andcommitted
t5500, t5601: skip tests which exercise paths with '[::1]' on Cygwin
Parsing repositories which contain '[::1]' is broken on Cygwin. It seems as if Cygwin is confusing those as drive letter prefixes or something like this, but I couldn't deduce the actual root cause. Mark those tests as broken for now. Signed-off-by: Patrick Steinhardt <[email protected]> Signed-off-by: Taylor Blau <[email protected]>
1 parent f74949f commit 5f8af25

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

t/t5500-fetch-pack.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ do
774774
# file with scheme
775775
for p in file
776776
do
777-
test_expect_success !MINGW "fetch-pack --diag-url $p://$h/$r" '
777+
test_expect_success !WINDOWS "fetch-pack --diag-url $p://$h/$r" '
778778
check_prot_path $p://$h/$r $p "/$r"
779779
'
780780
test_expect_success MINGW "fetch-pack --diag-url $p://$h/$r" '
@@ -784,7 +784,7 @@ do
784784
check_prot_path $p:///$r $p "/$r"
785785
'
786786
# No "/~" -> "~" conversion for file
787-
test_expect_success !MINGW "fetch-pack --diag-url $p://$h/~$r" '
787+
test_expect_success !WINDOWS "fetch-pack --diag-url $p://$h/~$r" '
788788
check_prot_path $p://$h/~$r $p "/~$r"
789789
'
790790
test_expect_success MINGW "fetch-pack --diag-url $p://$h/~$r" '
@@ -806,11 +806,17 @@ do
806806
p=ssh
807807
for h in host [::1]
808808
do
809-
test_expect_success "fetch-pack --diag-url $h:$r" '
809+
expectation="success"
810+
if test_have_prereq CYGWIN && test "$h" = "[::1]"
811+
then
812+
expectation="failure"
813+
fi
814+
815+
test_expect_$expectation "fetch-pack --diag-url $h:$r" '
810816
check_prot_host_port_path $h:$r $p "$h" NONE "$r"
811817
'
812818
# Do "/~" -> "~" conversion
813-
test_expect_success "fetch-pack --diag-url $h:/~$r" '
819+
test_expect_$expectation "fetch-pack --diag-url $h:/~$r" '
814820
check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
815821
'
816822
done

t/t5601-clone.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,10 +530,17 @@ do
530530
'
531531
done
532532

533+
# Parsing of paths that look like IPv6 addresses is broken on Cygwin.
534+
expectation_for_ipv6_tests=success
535+
if test_have_prereq CYGWIN
536+
then
537+
expectation_for_ipv6_tests=failure
538+
fi
539+
533540
#ipv6
534541
for repo in rep rep/home/project 123
535542
do
536-
test_expect_success "clone [::1]:$repo" '
543+
test_expect_$expectation_for_ipv6_tests "clone [::1]:$repo" '
537544
test_clone_url [::1]:$repo ::1 "$repo"
538545
'
539546
done
@@ -542,7 +549,7 @@ test_expect_success "clone host:/~repo" '
542549
test_clone_url host:/~repo host "~repo"
543550
'
544551

545-
test_expect_success "clone [::1]:/~repo" '
552+
test_expect_$expectation_for_ipv6_tests "clone [::1]:/~repo" '
546553
test_clone_url [::1]:/~repo ::1 "~repo"
547554
'
548555

0 commit comments

Comments
 (0)