aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-07-16 14:40:48 +0800
committerzeertzjq <zeertzjq@outlook.com>2024-07-16 14:41:02 +0800
commite84a4c5a987f2bb428d46a73bed175ba36729be5 (patch)
treef9969150df657b6609afe70914f6de4ade52e113
parenta35eda36c34ed9d43d775335f87e8719d383e2d4 (diff)
downloadrneovim-e84a4c5a987f2bb428d46a73bed175ba36729be5.tar.gz
rneovim-e84a4c5a987f2bb428d46a73bed175ba36729be5.tar.bz2
rneovim-e84a4c5a987f2bb428d46a73bed175ba36729be5.zip
vim-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 vim/vim#11065) https://github.com/vim/vim/commit/a9480dbc8c4381e4139db1ab7969722f4d100bac Co-authored-by: K.Takata <kentkt@csc.jp>
-rw-r--r--test/old/testdir/test_signals.vim20
1 files changed, 13 insertions, 7 deletions
diff --git a/test/old/testdir/test_signals.vim b/test/old/testdir/test_signals.vim
index b2dd7f9173..3ec4b975e1 100644
--- a/test/old/testdir/test_signals.vim
+++ b/test/old/testdir/test_signals.vim
@@ -112,10 +112,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')
@@ -130,21 +131,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.