mirror of
				https://github.com/neovim/neovim.git
				synced 2025-10-26 12:27:24 +00:00 
			
		
		
		
	test(old): remove workaround for TSAN CI (#24834)
Now that TSAN CI no longer runs oldtests, match upstream better.
This commit is contained in:
		| @@ -339,7 +339,7 @@ func RunVimPiped(before, after, arguments, pipecmd) | |||||||
|  |  | ||||||
|   let $NVIM_LOG_FILE = exists($NVIM_LOG_FILE) ? $NVIM_LOG_FILE : 'Xnvim.log' |   let $NVIM_LOG_FILE = exists($NVIM_LOG_FILE) ? $NVIM_LOG_FILE : 'Xnvim.log' | ||||||
|   " Nvim does not support -Z flag, remove it. |   " 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 |   if len(a:before) > 0 | ||||||
|     call delete('Xbefore.vim') |     call delete('Xbefore.vim') | ||||||
|   | |||||||
| @@ -1807,30 +1807,21 @@ func Test_normal22_zet() | |||||||
|   " Test for ZZ |   " Test for ZZ | ||||||
|   " let shell = &shell |   " let shell = &shell | ||||||
|   " let &shell = 'sh' |   " let &shell = 'sh' | ||||||
|  |   call writefile(['1', '2'], 'Xn22file', 'D') | ||||||
|   " 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') |  | ||||||
|   let args = ' -N -i NONE --noplugins -X --headless' |   let args = ' -N -i NONE --noplugins -X --headless' | ||||||
|   call system(GetVimCommand() .. args .. ' -c "%d" -c ":norm! ZZ" Xfile_Test_normal22_zet') |   call system(GetVimCommand() .. args .. ' -c "%d" -c ":norm! ZZ" Xn22file') | ||||||
|   let a = readfile('Xfile_Test_normal22_zet') |   let a = readfile('Xn22file') | ||||||
|   call assert_equal([], a) |   call assert_equal([], a) | ||||||
|   " Test for ZQ |   " Test for ZQ | ||||||
|   call writefile(['1', '2'], 'Xfile_Test_normal22_zet') |   call writefile(['1', '2'], 'Xn22file') | ||||||
|   call system(GetVimCommand() . args . ' -c "%d" -c ":norm! ZQ" Xfile_Test_normal22_zet') |   call system(GetVimCommand() . args . ' -c "%d" -c ":norm! ZQ" Xn22file') | ||||||
|   let a = readfile('Xfile_Test_normal22_zet') |   let a = readfile('Xn22file') | ||||||
|   call assert_equal(['1', '2'], a) |   call assert_equal(['1', '2'], a) | ||||||
|  |  | ||||||
|   " Unsupported Z command |   " Unsupported Z command | ||||||
|   call assert_beeps('normal! ZW') |   call assert_beeps('normal! ZW') | ||||||
|  |  | ||||||
|   " Nvim: This sometimes hangs the TSAN build. |   " clean up | ||||||
|   " for file in ['Xfile_Test_normal22_zet'] |  | ||||||
|   "   call delete(file) |  | ||||||
|   " endfor |  | ||||||
|   " let &shell = shell |   " let &shell = shell | ||||||
| endfunc | endfunc | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 zeertzjq
					zeertzjq