Skip to content

Commit 53753a3

Browse files
j6tgitster
authored andcommitted
t9001-send-email.sh: fix expected absolute paths on Windows
Git for Windows is a native Windows program that works with native absolute paths in the drive letter style C:\dir. The auxiliary infrastructure is based on MSYS2, which uses POSIX style /C/dir. When we test for output of absolute paths produced by git.exe, we usally have to expect C:\dir style paths. To produce such expected paths, we have to use $(pwd) in the test scripts; the alternative, $PWD, produces a POSIX style path. ($PWD is a shell variable, and the shell is bash, an MSYS2 program, and operates in the POSIX realm.) There are two recently added tests that were written to expect C:\dir paths. The output that is tested is produced by `git send-email`, but behind the scenes, this is a Perl script, which also works in the POSIX realm and produces /C/dir style output. In the first test case that is changed here, replace $(pwd) by $PWD so that the expected path is constructed using /C/dir style. The second test case sets core.hooksPath to an absolute path. Since the test script talks to native git.exe, it is supposed to place a C:/dir style path into the configuration; therefore, keep $(pwd). When this configuration value is consumed by the Perl script, it is transformed to /C/dir style by the MSYS2 layer and echoed back in this form in the error message. Hence, do use $PWD for the expected value. Signed-off-by: Johannes Sixt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ea7811b commit 53753a3

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

t/t9001-send-email.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -539,15 +539,14 @@ test_expect_success $PREREQ "--validate respects relative core.hooksPath path" '
539539
test_path_is_file my-hooks.ran &&
540540
cat >expect <<-EOF &&
541541
fatal: longline.patch: rejected by sendemail-validate hook
542-
fatal: command '"'"'$(pwd)/my-hooks/sendemail-validate'"'"' died with exit code 1
542+
fatal: command '"'"'$PWD/my-hooks/sendemail-validate'"'"' died with exit code 1
543543
warning: no patches were sent
544544
EOF
545545
test_cmp expect actual
546546
'
547547

548548
test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" '
549-
hooks_path="$(pwd)/my-hooks" &&
550-
test_config core.hooksPath "$hooks_path" &&
549+
test_config core.hooksPath "$(pwd)/my-hooks" &&
551550
test_when_finished "rm my-hooks.ran" &&
552551
test_must_fail git send-email \
553552
--from="Example <[email protected]>" \
@@ -558,7 +557,7 @@ test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" '
558557
test_path_is_file my-hooks.ran &&
559558
cat >expect <<-EOF &&
560559
fatal: longline.patch: rejected by sendemail-validate hook
561-
fatal: command '"'"'$hooks_path/sendemail-validate'"'"' died with exit code 1
560+
fatal: command '"'"'$PWD/my-hooks/sendemail-validate'"'"' died with exit code 1
562561
warning: no patches were sent
563562
EOF
564563
test_cmp expect actual

0 commit comments

Comments
 (0)