[PATCH] mingw: hot-fix t5615

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



That test made the incorrect assumption that the path separator character
is always a colon. On Windows, it is a semicolon instead.

Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
Published-As: https://github.com/dscho/git/releases/tag/t5615-path-separator-v1
Fetch-It-Via: git fetch https://github.com/dscho/git t5615-path-separator-v1

	This is required, but not sufficient, to fix `master` on Windows.

 t/t5615-alternate-env.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/t/t5615-alternate-env.sh b/t/t5615-alternate-env.sh
index 22d9d81..3aeffb6 100755
--- a/t/t5615-alternate-env.sh
+++ b/t/t5615-alternate-env.sh
@@ -37,8 +37,10 @@ test_expect_success 'access alternate via absolute path' '
 	EOF
 '
 
+sep=:
+test_have_prereq !MINGW || sep=\;
 test_expect_success 'access multiple alternates' '
-	check_obj "$(pwd)/one.git/objects:$(pwd)/two.git/objects" <<-EOF
+	check_obj "$(pwd)/one.git/objects$sep$(pwd)/two.git/objects" <<-EOF
 	$one blob
 	$two blob
 	EOF

base-commit: 0538b84027a8aba7e8b805e3ec8fceb3990023e5
-- 
2.10.1.583.g721a9e0



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]