diff options
| author | K.Takata <kentkt@csc.jp> | 2022-09-06 10:56:19 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-09-06 10:56:19 +0100 |
| commit | a9480dbc8c4381e4139db1ab7969722f4d100bac (patch) | |
| tree | 37bd1530a06223f9af19a7d590f0b19cb0217759 /src | |
| parent | e53a0d44090753d6284b34cc7fb5cf6c765d562c (diff) | |
patch 9.0.0393: signals test often fails on FreeBSDv9.0.0393
Problem: Signals test often fails on FreeBSD.
Solution: Use separate files for Suspend and Resume. (Ken Takata,
closes #11065)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_signals.vim | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/testdir/test_signals.vim b/src/testdir/test_signals.vim index b7a8b28217..ea25ae1091 100644 --- a/src/testdir/test_signals.vim +++ b/src/testdir/test_signals.vim @@ -111,10 +111,11 @@ func Test_signal_TSTP() " the test would then fail again if they are not deleted first. call delete('.Xsig_TERM.swp') call delete('XsetupAucmd') - call delete('XautoOut') + call delete('XautoOut1') + call delete('XautoOut2') let lines =<< trim END - au VimSuspend * call writefile(["VimSuspend triggered"], "XautoOut", "as") - au VimResume * call writefile(["VimResume triggered"], "XautoOut", "as") + au VimSuspend * call writefile(["VimSuspend triggered"], "XautoOut1", "as") + au VimResume * call writefile(["VimResume triggered"], "XautoOut2", "as") END call writefile(lines, 'XsetupAucmd') @@ -129,21 +130,26 @@ func Test_signal_TSTP() " After TSTP the file is not saved (same function as ^Z) exe 'silent !kill -s TSTP ' .. pid_vim call WaitForAssert({-> assert_true(filereadable('.Xsig_TERM.swp'))}) + sleep 100m " We resume after the suspend. Sleep a bit for the signal to take effect, " also when running under valgrind. exe 'silent !kill -s CONT ' .. pid_vim - sleep 100m + call WaitForAssert({-> assert_true(filereadable('XautoOut2'))}) + sleep 10m call StopVimInTerminal(buf) - let result = readfile('XautoOut') - call assert_equal(["VimSuspend triggered", "VimResume triggered"], result) + let result = readfile('XautoOut1') + call assert_equal(["VimSuspend triggered"], result) + let result = readfile('XautoOut2') + call assert_equal(["VimResume triggered"], result) %bwipe! call delete('.Xsig_TERM.swp') call delete('XsetupAucmd') - call delete('XautoOut') + call delete('XautoOut1') + call delete('XautoOut2') endfunc " Test a deadly signal. diff --git a/src/version.c b/src/version.c index 87603fc4b0..219b4144ba 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 393, +/**/ 392, /**/ 391, |