# HG changeset patch # User Bram Moolenaar # Date 1591017304 -7200 # Node ID 20b6d5304e56766d557fe09ef24d4ed882262f29 # Parent d9b8b101d506e15c34b3b98745bf206d25383032 patch 8.2.0874: signals test is a bit flaky Commit: https://github.com/vim/vim/commit/d14fd5285e491a39028c4b4722ddbe7c9dfa9bb2 Author: Bram Moolenaar Date: Mon Jun 1 15:05:19 2020 +0200 patch 8.2.0874: signals test is a bit flaky Problem: Signals test is a bit flaky. Solution: Flush the XautoOut file. Delete files that may be left behind from a failure. (Dominique Pelle, closes #6179) diff --git a/src/testdir/test_signals.vim b/src/testdir/test_signals.vim --- a/src/testdir/test_signals.vim +++ b/src/testdir/test_signals.vim @@ -123,9 +123,15 @@ func Test_deadly_signal_TERM() if cmd =~ 'valgrind' throw 'Skipped: cannot test signal TERM with valgrind' endif + + " If test fails once, it can leave temporary files and trying to rerun + " the test would then fail again if they are not deleted first. + call delete('.Xsig_TERM.swp') + call delete('XsetupAucmd') + call delete('XautoOut') let lines =<< trim END - au VimLeave * call writefile(["VimLeave triggered"], "XautoOut", "a") - au VimLeavePre * call writefile(["VimLeavePre triggered"], "XautoOut", "a") + au VimLeave * call writefile(["VimLeave triggered"], "XautoOut", "as") + au VimLeavePre * call writefile(["VimLeavePre triggered"], "XautoOut", "as") END call writefile(lines, 'XsetupAucmd') diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 874, +/**/ 873, /**/ 872,