diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-08-22 20:03:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-22 20:03:03 +0800 |
| commit | 3f1a12b8cc6629e8fc6203f494229557ca46ae57 (patch) | |
| tree | d562d6e64078dd32f3fb555ea676d92ec971dfd1 | |
| parent | 94f2da09e10c195ca2e6141144f290bf488737d1 (diff) | |
| download | rneovim-3f1a12b8cc6629e8fc6203f494229557ca46ae57.tar.gz rneovim-3f1a12b8cc6629e8fc6203f494229557ca46ae57.tar.bz2 rneovim-3f1a12b8cc6629e8fc6203f494229557ca46ae57.zip | |
test(old): remove workaround for TSAN CI (#24834)
Now that TSAN CI no longer runs oldtests, match upstream better.
| -rw-r--r-- | test/old/testdir/shared.vim | 2 | ||||
| -rw-r--r-- | test/old/testdir/test_normal.vim | 23 |
2 files changed, 8 insertions, 17 deletions
diff --git a/test/old/testdir/shared.vim b/test/old/testdir/shared.vim index 35ff434d40..e7a5f471e7 100644 --- a/test/old/testdir/shared.vim +++ b/test/old/testdir/shared.vim @@ -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') diff --git a/test/old/testdir/test_normal.vim b/test/old/testdir/test_normal.vim index 4eaab0d792..08a3c57a94 100644 --- a/test/old/testdir/test_normal.vim +++ b/test/old/testdir/test_normal.vim @@ -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 |