diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-06-23 16:34:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-23 16:34:40 -0700 |
| commit | 34d765e736e015f5c4790db2c0a1d3ddbd4bd3e9 (patch) | |
| tree | 2975ca71ed8889bd28cc534a48d26bb6ad94f73a | |
| parent | ll-merge: killing the external merge driver aborts the merge (diff) | |
| download | git-34d765e736e015f5c4790db2c0a1d3ddbd4bd3e9.tar.gz git-34d765e736e015f5c4790db2c0a1d3ddbd4bd3e9.zip | |
t6406: skip "external merge driver getting killed by a signal" test on Windows
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>
| -rwxr-xr-x | t/t6406-merge-attr.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6406-merge-attr.sh b/t/t6406-merge-attr.sh index b50aedbc00..9677180a5b 100755 --- 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 && |