diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-01 15:05:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-01 15:05:19 +0200 |
| commit | d14fd5285e491a39028c4b4722ddbe7c9dfa9bb2 (patch) | |
| tree | 8165c24b59775fc7db17c2dcebe81a204e7bc345 | |
| parent | 2891459b81a21dbd2802ef1ae106c6680f085899 (diff) | |
patch 8.2.0874: signals test is a bit flakyv8.2.0874
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)
| -rw-r--r-- | src/testdir/test_signals.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/testdir/test_signals.vim b/src/testdir/test_signals.vim index 135037adc9..78b2cecb85 100644 --- 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 index df3640829b..66102522a8 100644 --- 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, |