From: Johannes Sixt <j6t@kdbg.org>
Date: Wed, 25 Mar 2009 12:21:15 +0000 (+0100)
Subject: t7502-commit: Skip SIGTERM test on Windows
X-Git-Tag: v1.6.3-rc0~93^2
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=fb9a2beab2002894fb970cba4e32ebb1c41176b2;p=git.git

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>
---

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