test(old): remove workaround for TSAN CI (#24834)

Now that TSAN CI no longer runs oldtests, match upstream better.
This commit is contained in:
zeertzjq
2023-08-22 20:03:03 +08:00
committed by GitHub
parent 94f2da09e1
commit 3f1a12b8cc
2 changed files with 8 additions and 17 deletions

View File

@@ -339,7 +339,7 @@ func RunVimPiped(before, after, arguments, pipecmd)
let $NVIM_LOG_FILE = exists($NVIM_LOG_FILE) ? $NVIM_LOG_FILE : 'Xnvim.log'
" Nvim does not support -Z flag, remove it.
exe "silent !" . a:pipecmd . cmd . args . ' ' . substitute(a:arguments, '-Z', '', 'g')
exe "silent !" . a:pipecmd . cmd . args . ' ' . a:arguments->substitute('-Z', '', 'g')
if len(a:before) > 0
call delete('Xbefore.vim')

View File

@@ -1807,30 +1807,21 @@ func Test_normal22_zet()
" Test for ZZ
" let shell = &shell
" let &shell = 'sh'
" Remove any stale test files from previous run.
for file in ['Xfile_Test_normal22_zet']
call delete(file)
endfor
call writefile(['1', '2'], 'Xfile_Test_normal22_zet')
call writefile(['1', '2'], 'Xn22file', 'D')
let args = ' -N -i NONE --noplugins -X --headless'
call system(GetVimCommand() .. args .. ' -c "%d" -c ":norm! ZZ" Xfile_Test_normal22_zet')
let a = readfile('Xfile_Test_normal22_zet')
call system(GetVimCommand() .. args .. ' -c "%d" -c ":norm! ZZ" Xn22file')
let a = readfile('Xn22file')
call assert_equal([], a)
" Test for ZQ
call writefile(['1', '2'], 'Xfile_Test_normal22_zet')
call system(GetVimCommand() . args . ' -c "%d" -c ":norm! ZQ" Xfile_Test_normal22_zet')
let a = readfile('Xfile_Test_normal22_zet')
call writefile(['1', '2'], 'Xn22file')
call system(GetVimCommand() . args . ' -c "%d" -c ":norm! ZQ" Xn22file')
let a = readfile('Xn22file')
call assert_equal(['1', '2'], a)
" Unsupported Z command
call assert_beeps('normal! ZW')
" Nvim: This sometimes hangs the TSAN build.
" for file in ['Xfile_Test_normal22_zet']
" call delete(file)
" endfor
" clean up
" let &shell = shell
endfunc