]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t6406: skip "external merge driver getting killed by a signal" test on Windows
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Jun 2023 23:34:40 +0000 (16:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Jun 2023 23:34:40 +0000 (16:34 -0700)
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 <gitster@pobox.com>
t/t6406-merge-attr.sh

index b50aedbc007a402bdd92f02ff1f42f805718fd46..9677180a5b3392da63ab32f4462c5ec89a9958f3 100755 (executable)
@@ -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 &&