diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-25 15:08:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-25 15:08:09 -0700 |
| commit | 8befac5d6f9e994d72efb1ecc59c356414114e7e (patch) | |
| tree | b7f6b1d3bcd4902c2a792582c5d87f46b37311d6 /t | |
| parent | 5c928c06e251b651202f94aaac56cacd3f57c484 (diff) | |
| parent | fb9a2beab2002894fb970cba4e32ebb1c41176b2 (diff) | |
| download | git-8befac5d6f9e994d72efb1ecc59c356414114e7e.tar.gz git-8befac5d6f9e994d72efb1ecc59c356414114e7e.tar.xz | |
Merge branch 'for-junio' of git://repo.or.cz/git/mingw/j6t
* 'for-junio' of git://repo.or.cz/git/mingw/j6t:
t7502-commit: Skip SIGTERM test on Windows
t7005-editor: Use $SHELL_PATH in the editor scripts
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7005-editor.sh | 1 | ||||
| -rwxr-xr-x | t/t7502-commit.sh | 2 | ||||
| -rw-r--r-- | t/test-lib.sh | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh index 2f8404afb..e83bc8fd8 100755 --- a/t/t7005-editor.sh +++ b/t/t7005-editor.sh @@ -7,6 +7,7 @@ test_description='GIT_EDITOR, core.editor, and stuff' for i in GIT_EDITOR core_editor EDITOR VISUAL vi do cat >e-$i.sh <<-EOF + #!$SHELL_PATH echo "Edited by $i" >"\$1" EOF chmod +x e-$i.sh diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index ad42c78d7..56cd86601 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -234,7 +234,7 @@ cat >.git/FAKE_EDITOR <<EOF # kill -TERM command added below. EOF -test_expect_success 'a SIGTERM should break locks' ' +test_expect_success EXECKEEPSPID 'a SIGTERM should break locks' ' echo >>negative && ! "$SHELL_PATH" -c '\'' echo kill -TERM $$ >> .git/FAKE_EDITOR diff --git a/t/test-lib.sh b/t/test-lib.sh index 8de5ee1b5..2979e8ea0 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -697,10 +697,12 @@ case $(uname -s) in } # no POSIX permissions # backslashes in pathspec are converted to '/' + # exec does not inherit the PID ;; *) test_set_prereq POSIXPERM test_set_prereq BSLASHPSPEC + test_set_prereq EXECKEEPSPID ;; esac |