Skip to content

Commit a9480db

Browse files
k-takatabrammool
authored andcommitted
patch 9.0.0393: signals test often fails on FreeBSD
Problem: Signals test often fails on FreeBSD. Solution: Use separate files for Suspend and Resume. (Ken Takata, closes #11065)
1 parent e53a0d4 commit a9480db

2 files changed

Lines changed: 15 additions & 7 deletions

File tree

src/testdir/test_signals.vim

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,11 @@ func Test_signal_TSTP()
111111
" the test would then fail again if they are not deleted first.
112112
call delete('.Xsig_TERM.swp')
113113
call delete('XsetupAucmd')
114-
call delete('XautoOut')
114+
call delete('XautoOut1')
115+
call delete('XautoOut2')
115116
let lines =<< trim END
116-
au VimSuspend * call writefile(["VimSuspend triggered"], "XautoOut", "as")
117-
au VimResume * call writefile(["VimResume triggered"], "XautoOut", "as")
117+
au VimSuspend * call writefile(["VimSuspend triggered"], "XautoOut1", "as")
118+
au VimResume * call writefile(["VimResume triggered"], "XautoOut2", "as")
118119
END
119120
call writefile(lines, 'XsetupAucmd')
120121

@@ -129,21 +130,26 @@ func Test_signal_TSTP()
129130
" After TSTP the file is not saved (same function as ^Z)
130131
exe 'silent !kill -s TSTP ' .. pid_vim
131132
call WaitForAssert({-> assert_true(filereadable('.Xsig_TERM.swp'))})
133+
sleep 100m
132134

133135
" We resume after the suspend. Sleep a bit for the signal to take effect,
134136
" also when running under valgrind.
135137
exe 'silent !kill -s CONT ' .. pid_vim
136-
sleep 100m
138+
call WaitForAssert({-> assert_true(filereadable('XautoOut2'))})
139+
sleep 10m
137140

138141
call StopVimInTerminal(buf)
139142

140-
let result = readfile('XautoOut')
141-
call assert_equal(["VimSuspend triggered", "VimResume triggered"], result)
143+
let result = readfile('XautoOut1')
144+
call assert_equal(["VimSuspend triggered"], result)
145+
let result = readfile('XautoOut2')
146+
call assert_equal(["VimResume triggered"], result)
142147

143148
%bwipe!
144149
call delete('.Xsig_TERM.swp')
145150
call delete('XsetupAucmd')
146-
call delete('XautoOut')
151+
call delete('XautoOut1')
152+
call delete('XautoOut2')
147153
endfunc
148154

149155
" Test a deadly signal.

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,8 @@ static char *(features[]) =
703703

704704
static int included_patches[] =
705705
{ /* Add new patch number below this line */
706+
/**/
707+
393,
706708
/**/
707709
392,
708710
/**/

0 commit comments

Comments
 (0)