t6406: skip "external merge driver getting killed by a signal" test on Windows

gitster · gitster · commit 34d765e736e0 · 2023-06-23T16:34:40.000-07:00
The run_command() on the platform does not seem to report death by
signal as the caller expects.  For now, skip the test on Windows.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t6406-merge-attr.sh b/t/t6406-merge-attr.sh
@@ -168,7 +168,7 @@ test_expect_success 'custom merge backend' '
 	rm -f $o $a $b
 '
 
-test_expect_success 'custom merge driver that is killed with a signal' '
+test_expect_success !WINDOWS 'custom merge driver that is killed with a signal' '
 	test_when_finished "rm -f output please-abort" &&
 
 	git reset --hard anchor &&

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ test_expect_success 'custom merge backend' '`
`168`	`168`	`rm -f $o $a $b`
`169`	`169`	`'`
`170`	`170`
`171`		`-test_expect_success 'custom merge driver that is killed with a signal' '`
	`171`	`+test_expect_success !WINDOWS 'custom merge driver that is killed with a signal' '`
`172`	`172`	`test_when_finished "rm -f output please-abort" &&`
`173`	`173`
`174`	`174`	`git reset --hard anchor &&`