summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <j6t@kdbg.org>2009-03-25 13:21:15 +0100
committerLibravatar Johannes Sixt <j6t@kdbg.org>2009-03-25 21:25:57 +0100
commitfb9a2beab2002894fb970cba4e32ebb1c41176b2 (patch)
tree20db1485c9807cb7030f6876fdaf47c00e867a38
parentt7005-editor: Use $SHELL_PATH in the editor scripts (diff)
downloadtgif-fb9a2beab2002894fb970cba4e32ebb1c41176b2.tar.xz
t7502-commit: Skip SIGTERM test on Windows
The implementation of exec on Windows is just a rough approximation of the POSIX behavior. In particular, no real process "overlay" happens (a new process is spawned instead and the parent process waits until the child terminates). In particular, the process ID cannot be taken by the exec'd process. But there is one test in t7502-commit.sh that depends on this. We have to skip it on Windows. Signed-off-by: Johannes Sixt <j6t@kdbg.org>
-rwxr-xr-xt/t7502-commit.sh2
-rw-r--r--t/test-lib.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index ad42c78d7c..56cd866019 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 b4b626e837..572301df1b 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -689,10 +689,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