vim-patch:9.0.0525: manually deleting temp test files

Problem:    Manually deleting temp test files.
Solution:   Add the 'D' flag to writefile().

5917341f65

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2023-11-13 08:58:58 +08:00
parent b9cffe40fa
commit 629f117945
4 changed files with 56 additions and 100 deletions

View File

@ -81,10 +81,10 @@ func Test_Debugger()
endfor
enddef
END
call writefile(lines, 'Xtest.vim')
call writefile(lines, 'XtestDebug.vim', 'D')
" Start Vim in a terminal
let buf = RunVimInTerminal('-S Xtest.vim', {})
let buf = RunVimInTerminal('-S XtestDebug.vim', {})
" Start the Vim debugger
call RunDbgCmd(buf, ':debug echo Foo()', ['cmd: echo Foo()'])
@ -344,19 +344,18 @@ func Test_Debugger_breakadd()
let var3 = 30
let var4 = 40
END
call writefile(lines, 'Xtest.vim')
call writefile(lines, 'XdebugBreakadd.vim', 'D')
" Start Vim in a terminal
let buf = RunVimInTerminal('Xtest.vim', {})
call RunDbgCmd(buf, ':breakadd file 2 Xtest.vim')
let buf = RunVimInTerminal('XdebugBreakadd.vim', {})
call RunDbgCmd(buf, ':breakadd file 2 XdebugBreakadd.vim')
call RunDbgCmd(buf, ':4 | breakadd here')
call RunDbgCmd(buf, ':source Xtest.vim', ['line 2: let var2 = 20'])
call RunDbgCmd(buf, ':source XdebugBreakadd.vim', ['line 2: let var2 = 20'])
call RunDbgCmd(buf, 'cont', ['line 4: let var4 = 40'])
call RunDbgCmd(buf, 'cont')
call StopVimInTerminal(buf)
call delete('Xtest.vim')
%bw!
call assert_fails('breakadd here', 'E32:')
@ -371,31 +370,30 @@ func Test_Debugger_breakadd_expr()
let lines =<< trim END
let g:Xtest_var += 1
END
call writefile(lines, 'Xtest.vim')
call writefile(lines, 'XdebugBreakExpr.vim', 'D')
" Start Vim in a terminal
let buf = RunVimInTerminal('Xtest.vim', {})
let buf = RunVimInTerminal('XdebugBreakExpr.vim', {})
call RunDbgCmd(buf, ':let g:Xtest_var = 10')
call RunDbgCmd(buf, ':breakadd expr g:Xtest_var')
call RunDbgCmd(buf, ':source %')
let expected =<< eval trim END
let expected =<< trim eval END
Oldval = "10"
Newval = "11"
{fnamemodify('Xtest.vim', ':p')}
{fnamemodify('XdebugBreakExpr.vim', ':p')}
line 1: let g:Xtest_var += 1
END
call RunDbgCmd(buf, ':source %', expected)
call RunDbgCmd(buf, 'cont')
let expected =<< eval trim END
let expected =<< trim eval END
Oldval = "11"
Newval = "12"
{fnamemodify('Xtest.vim', ':p')}
{fnamemodify('XdebugBreakExpr.vim', ':p')}
line 1: let g:Xtest_var += 1
END
call RunDbgCmd(buf, ':source %', expected)
call StopVimInTerminal(buf)
call delete('Xtest.vim')
endfunc
func Test_Backtrace_Through_Source()
@ -415,7 +413,7 @@ func Test_Backtrace_Through_Source()
call CallAFunction()
endfunc
END
call writefile(file1, 'Xtest1.vim')
call writefile(file1, 'Xtest1.vim', 'D')
let file2 =<< trim END
func DoAThing()
@ -428,7 +426,7 @@ func Test_Backtrace_Through_Source()
call File2Function()
END
call writefile(file2, 'Xtest2.vim')
call writefile(file2, 'Xtest2.vim', 'D')
let buf = RunVimInTerminal('-S Xtest1.vim', {})
@ -570,8 +568,6 @@ func Test_Backtrace_Through_Source()
\ 'line 1: call DoAThing()'])
call StopVimInTerminal(buf)
call delete('Xtest1.vim')
call delete('Xtest2.vim')
endfunc
func Test_Backtrace_Autocmd()
@ -593,7 +589,7 @@ func Test_Backtrace_Autocmd()
au User TestGlobalFunction :call GlobalFunction() | echo "Done"
END
call writefile(file1, 'Xtest1.vim')
call writefile(file1, 'Xtest1.vim', 'D')
let file2 =<< trim END
func DoAThing()
@ -606,7 +602,7 @@ func Test_Backtrace_Autocmd()
call File2Function()
END
call writefile(file2, 'Xtest2.vim')
call writefile(file2, 'Xtest2.vim', 'D')
let buf = RunVimInTerminal('-S Xtest1.vim', {})
@ -826,8 +822,6 @@ func Test_Backtrace_Autocmd()
\ 'cmd: echo "Done"'])
call StopVimInTerminal(buf)
call delete('Xtest1.vim')
call delete('Xtest2.vim')
endfunc
func Test_Backtrace_CmdLine()
@ -849,7 +843,7 @@ func Test_Backtrace_CmdLine()
au User TestGlobalFunction :call GlobalFunction() | echo "Done"
END
call writefile(file1, 'Xtest1.vim')
call writefile(file1, 'Xtest1.vim', 'D')
let file2 =<< trim END
func DoAThing()
@ -862,7 +856,7 @@ func Test_Backtrace_CmdLine()
call File2Function()
END
call writefile(file2, 'Xtest2.vim')
call writefile(file2, 'Xtest2.vim', 'D')
let buf = RunVimInTerminal(
\ '-S Xtest1.vim -c "debug call GlobalFunction()"',
@ -888,8 +882,6 @@ func Test_Backtrace_CmdLine()
\ 'line 1: call CallAFunction()'])
call StopVimInTerminal(buf)
call delete('Xtest1.vim')
call delete('Xtest2.vim')
endfunc
func Test_Backtrace_DefFunction()
@ -915,7 +907,7 @@ func Test_Backtrace_DefFunction()
defcompile
END
call writefile(file1, 'Xtest1.vim')
call writefile(file1, 'Xtest1.vim', 'D')
let file2 =<< trim END
vim9script
@ -933,7 +925,7 @@ func Test_Backtrace_DefFunction()
defcompile
File2Function()
END
call writefile(file2, 'Xtest2.vim')
call writefile(file2, 'Xtest2.vim', 'D')
let buf = RunVimInTerminal('-S Xtest1.vim', {})
@ -984,8 +976,6 @@ func Test_Backtrace_DefFunction()
\ #{match: 'pattern'})
call StopVimInTerminal(buf)
call delete('Xtest1.vim')
call delete('Xtest2.vim')
endfunc
func Test_DefFunction_expr()
@ -1000,14 +990,13 @@ func Test_DefFunction_expr()
enddef
defcompile
END
call writefile(file3, 'Xtest3.vim')
call writefile(file3, 'Xtest3.vim', 'D')
let buf = RunVimInTerminal('-S Xtest3.vim', {})
call RunDbgCmd(buf, ':breakadd expr g:someVar')
call RunDbgCmd(buf, ':call g:ChangeVar()', ['Oldval = "''foo''"', 'Newval = "''bar''"', 'function ChangeVar', 'line 2: echo "changed"'])
call StopVimInTerminal(buf)
call delete('Xtest3.vim')
endfunc
func Test_debug_def_and_legacy_function()
@ -1037,7 +1026,7 @@ func Test_debug_def_and_legacy_function()
breakadd func 2 g:SomeFunc
END
call writefile(file, 'XtestDebug.vim')
call writefile(file, 'XtestDebug.vim', 'D')
let buf = RunVimInTerminal('-S XtestDebug.vim', {})
@ -1054,7 +1043,6 @@ func Test_debug_def_and_legacy_function()
call RunDbgCmd(buf, 'cont')
call StopVimInTerminal(buf)
call delete('XtestDebug.vim')
endfunc
func Test_debug_def_function()
@ -1111,7 +1099,7 @@ func Test_debug_def_function()
| eval 2 + 3
enddef
END
call writefile(file, 'Xtest.vim')
call writefile(file, 'Xtest.vim', 'D')
let buf = RunVimInTerminal('-S Xtest.vim', {})
@ -1178,7 +1166,6 @@ func Test_debug_def_function()
call RunDbgCmd(buf, 'cont')
call StopVimInTerminal(buf)
call delete('Xtest.vim')
endfunc
func Test_debug_def_function_with_lambda()
@ -1193,7 +1180,7 @@ func Test_debug_def_function_with_lambda()
enddef
breakadd func 2 g:Func
END
call writefile(lines, 'XtestLambda.vim')
call writefile(lines, 'XtestLambda.vim', 'D')
let buf = RunVimInTerminal('-S XtestLambda.vim', {})
@ -1206,7 +1193,6 @@ func Test_debug_def_function_with_lambda()
call RunDbgCmd(buf, 'cont')
call StopVimInTerminal(buf)
call delete('XtestLambda.vim')
endfunc
func Test_debug_backtrace_level()
@ -1225,7 +1211,7 @@ func Test_debug_backtrace_level()
call s:File1Func( 'arg1' )
END
call writefile(lines, 'Xtest1.vim')
call writefile(lines, 'Xtest1.vim', 'D')
let lines =<< trim END
let s:file2_var = 'file2'
@ -1238,7 +1224,7 @@ func Test_debug_backtrace_level()
call s:File2Func( 'arg2' )
END
call writefile(lines, 'Xtest2.vim')
call writefile(lines, 'Xtest2.vim', 'D')
let file1 = getcwd() .. '/Xtest1.vim'
let file2 = getcwd() .. '/Xtest2.vim'
@ -1399,8 +1385,6 @@ func Test_debug_backtrace_level()
call RunDbgCmd(buf, 'cont')
call StopVimInTerminal(buf)
call delete('Xtest1.vim')
call delete('Xtest2.vim')
endfunc
" Test for setting a breakpoint on a :endif where the :if condition is false

View File

@ -875,7 +875,7 @@ func Test_diff_screen()
set diffexpr=
endfunc
END
call writefile(lines, 'XdiffSetup')
call writefile(lines, 'XdiffSetup', 'D')
" clean up already existing swap files, just in case
call delete('.Xdifile1.swp')
@ -1003,7 +1003,6 @@ func Test_diff_screen()
call StopVimInTerminal(buf)
call delete('Xdifile1')
call delete('Xdifile2')
call delete('XdiffSetup')
endfunc
func Test_diff_with_scroll_and_change()
@ -1017,7 +1016,7 @@ func Test_diff_with_scroll_and_change()
wincmd h
exe "normal Gl5\<C-E>"
END
call writefile(lines, 'Xtest_scroll_change')
call writefile(lines, 'Xtest_scroll_change', 'D')
let buf = RunVimInTerminal('-S Xtest_scroll_change', {})
call VerifyScreenDump(buf, 'Test_diff_scroll_change_01', {})
@ -1030,7 +1029,6 @@ func Test_diff_with_scroll_and_change()
" clean up
call StopVimInTerminal(buf)
call delete('Xtest_scroll_change')
endfunc
func Test_diff_with_cursorline()
@ -1044,7 +1042,7 @@ func Test_diff_with_cursorline()
\ 'call setline(1, ["bee","foo","foo","baz"])',
\ 'windo diffthis',
\ '2wincmd w',
\ ], 'Xtest_diff_cursorline')
\ ], 'Xtest_diff_cursorline', 'D')
let buf = RunVimInTerminal('-S Xtest_diff_cursorline', {})
call VerifyScreenDump(buf, 'Test_diff_with_cursorline_01', {})
@ -1055,7 +1053,6 @@ func Test_diff_with_cursorline()
" clean up
call StopVimInTerminal(buf)
call delete('Xtest_diff_cursorline')
endfunc
func Test_diff_with_cursorline_number()
@ -1072,7 +1069,7 @@ func Test_diff_with_cursorline_number()
windo diffthis
1wincmd w
END
call writefile(lines, 'Xtest_diff_cursorline_number')
call writefile(lines, 'Xtest_diff_cursorline_number', 'D')
let buf = RunVimInTerminal('-S Xtest_diff_cursorline_number', {})
call VerifyScreenDump(buf, 'Test_diff_with_cursorline_number_01', {})
@ -1081,7 +1078,6 @@ func Test_diff_with_cursorline_number()
" clean up
call StopVimInTerminal(buf)
call delete('Xtest_diff_cursorline_number')
endfunc
func Test_diff_with_cursorline_breakindent()
@ -1098,7 +1094,7 @@ func Test_diff_with_cursorline_breakindent()
\ 'exe "norm 20Abee\<Esc>j20Afoo\<Esc>j20Afoo\<Esc>j20Abaz\<Esc>"',
\ 'windo diffthis',
\ '2wincmd w',
\ ], 'Xtest_diff_cursorline_breakindent')
\ ], 'Xtest_diff_cursorline_breakindent', 'D')
let buf = RunVimInTerminal('-S Xtest_diff_cursorline_breakindent', {})
call term_sendkeys(buf, "gg0")
@ -1112,7 +1108,6 @@ func Test_diff_with_cursorline_breakindent()
" clean up
call StopVimInTerminal(buf)
call delete('Xtest_diff_cursorline_breakindent')
endfunc
func Test_diff_with_syntax()
@ -1125,7 +1120,7 @@ func Test_diff_with_syntax()
return 5;
}
END
call writefile(lines, 'Xprogram1.c')
call writefile(lines, 'Xprogram1.c', 'D')
let lines =<< trim END
void doSomething() {
int x = 0;
@ -1133,22 +1128,19 @@ func Test_diff_with_syntax()
return 5;
}
END
call writefile(lines, 'Xprogram2.c')
call writefile(lines, 'Xprogram2.c', 'D')
let lines =<< trim END
edit Xprogram1.c
diffsplit Xprogram2.c
END
call writefile(lines, 'Xtest_diff_syntax')
call writefile(lines, 'Xtest_diff_syntax', 'D')
let buf = RunVimInTerminal('-S Xtest_diff_syntax', {})
call VerifyScreenDump(buf, 'Test_diff_syntax_1', {})
" clean up
call StopVimInTerminal(buf)
call delete('Xtest_diff_syntax')
call delete('Xprogram1.c')
call delete('Xprogram2.c')
endfunc
func Test_diff_of_diff()
@ -1160,7 +1152,9 @@ func Test_diff_of_diff()
\ 'vnew',
\ 'call setline(1, ["aa","bb","cc"])',
\ 'windo diffthis',
\ ], 'Xtest_diff_diff')
\ '1wincmd w',
\ 'setlocal number',
\ ], 'Xtest_diff_diff', 'D')
let buf = RunVimInTerminal('-S Xtest_diff_diff', {})
call VerifyScreenDump(buf, 'Test_diff_of_diff_01', {})
@ -1170,7 +1164,6 @@ func Test_diff_of_diff()
" clean up
call StopVimInTerminal(buf)
call delete('Xtest_diff_diff')
endfunc
func CloseoffSetup()
@ -1252,8 +1245,8 @@ func Test_patchexpr()
endfunc
set patchexpr=TPatch()
call writefile(['input file'], 'Xinput')
call writefile(['diff file'], 'Xdiff')
call writefile(['input file'], 'Xinput', 'D')
call writefile(['diff file'], 'Xdiff', 'D')
%bwipe!
edit Xinput
diffpatch Xdiff
@ -1270,8 +1263,6 @@ func Test_patchexpr()
set patchexpr=<SID>NewPatchExpr()
call assert_equal(expand('<SID>') .. 'NewPatchExpr()', &patchexpr)
call delete('Xinput')
call delete('Xdiff')
set patchexpr&
delfunc TPatch
delfunc s:NewPatchExpr
@ -1291,7 +1282,7 @@ func Test_diff_rnu()
windo diffthis
setlocal number rnu foldcolumn=0
END
call writefile(content, 'Xtest_diff_rnu')
call writefile(content, 'Xtest_diff_rnu', 'D')
let buf = RunVimInTerminal('-S Xtest_diff_rnu', {})
call VerifyScreenDump(buf, 'Test_diff_rnu_01', {})
@ -1303,7 +1294,6 @@ func Test_diff_rnu()
" clean up
call StopVimInTerminal(buf)
call delete('Xtest_diff_rnu')
endfunc
func Test_diff_multilineconceal()
@ -1351,7 +1341,7 @@ func Test_diff_filler_cursorcolumn()
norm! gg0
redraw!
END
call writefile(content, 'Xtest_diff_cuc')
call writefile(content, 'Xtest_diff_cuc', 'D')
let buf = RunVimInTerminal('-S Xtest_diff_cuc', {})
call VerifyScreenDump(buf, 'Test_diff_cuc_01', {})
@ -1368,7 +1358,6 @@ func Test_diff_filler_cursorcolumn()
" clean up
call StopVimInTerminal(buf)
call delete('Xtest_diff_cuc')
endfunc
" Test for adding/removing lines inside diff chunks, between diff chunks
@ -1467,7 +1456,7 @@ func Test_diff_binary()
norm! gg0
redraw!
END
call writefile(content, 'Xtest_diff_bin')
call writefile(content, 'Xtest_diff_bin', 'D')
let buf = RunVimInTerminal('-S Xtest_diff_bin', {})
" Test using internal diff
@ -1488,7 +1477,6 @@ func Test_diff_binary()
" clean up
call StopVimInTerminal(buf)
call delete('Xtest_diff_bin')
set diffopt&vim
endfunc
@ -1558,7 +1546,7 @@ func Test_diff_scroll()
// containing
// four lines
END
call writefile(left, 'Xleft')
call writefile(left, 'Xleft', 'D')
let right =<< trim END
line 1
line 2
@ -1594,7 +1582,7 @@ func Test_diff_scroll()
// containing
// four lines
END
call writefile(right, 'Xright')
call writefile(right, 'Xright', 'D')
let buf = RunVimInTerminal('-d Xleft Xright', {'rows': 12})
call term_sendkeys(buf, "\<C-W>\<C-W>jjjj")
call VerifyScreenDump(buf, 'Test_diff_scroll_1', {})
@ -1602,8 +1590,6 @@ func Test_diff_scroll()
call VerifyScreenDump(buf, 'Test_diff_scroll_2', {})
call StopVimInTerminal(buf)
call delete('Xleft')
call delete('Xright')
endfunc
" This was scrolling too many lines.

View File

@ -456,9 +456,7 @@ func Test_digraphs_output()
endfunc
func Test_loadkeymap()
if !has('keymap')
return
endif
CheckFeature keymap
new
set keymap=czech
set iminsert=0
@ -498,13 +496,10 @@ endfunc
" Test for error in a keymap file
func Test_loadkeymap_error()
if !has('keymap')
return
endif
CheckFeature keymap
call assert_fails('loadkeymap', 'E105:')
call writefile(['loadkeymap', 'a'], 'Xkeymap')
call writefile(['loadkeymap', 'a'], 'Xkeymap', 'D')
call assert_fails('source Xkeymap', 'E791:')
call delete('Xkeymap')
endfunc
" Test for the characters displayed on the screen when entering a digraph

View File

@ -79,7 +79,7 @@ func Test_scroll_without_region()
set t_cs=
set laststatus=2
END
call writefile(lines, 'Xtestscroll')
call writefile(lines, 'Xtestscroll', 'D')
let buf = RunVimInTerminal('-S Xtestscroll', #{rows: 10})
call VerifyScreenDump(buf, 'Test_scroll_no_region_1', {})
@ -103,11 +103,9 @@ func Test_scroll_without_region()
" clean up
call StopVimInTerminal(buf)
call delete('Xtestscroll')
endfunc
func Test_display_listchars_precedes()
set fillchars+=vert:\|
call NewWindow(10, 10)
" Need a physical line that wraps over the complete
" window size
@ -174,14 +172,13 @@ func Test_scroll_CursorLineNr_update()
exe ":norm! o\<esc>110ia\<esc>"
END
let filename = 'Xdrawscreen'
call writefile(lines, filename)
call writefile(lines, filename, 'D')
let buf = RunVimInTerminal('-S '.filename, #{rows: 5, cols: 50})
call term_sendkeys(buf, "k")
call VerifyScreenDump(buf, 'Test_winline_rnu', {})
" clean up
call StopVimInTerminal(buf)
call delete(filename)
endfunc
" check a long file name does not result in the hit-enter prompt
@ -189,28 +186,27 @@ func Test_edit_long_file_name()
CheckScreendump
let longName = 'x'->repeat(min([&columns, 255]))
call writefile([], longName)
call writefile([], longName, 'D')
let buf = RunVimInTerminal('-N -u NONE ' .. longName, #{rows: 8})
call VerifyScreenDump(buf, 'Test_long_file_name_1', {})
" clean up
call StopVimInTerminal(buf)
call delete(longName)
endfunc
func Test_unprintable_fileformats()
CheckScreendump
call writefile(["unix\r", "two"], 'Xunix.txt')
call writefile(["mac\r", "two"], 'Xmac.txt')
call writefile(["unix\r", "two"], 'Xunix.txt', 'D')
call writefile(["mac\r", "two"], 'Xmac.txt', 'D')
let lines =<< trim END
edit Xunix.txt
split Xmac.txt
edit ++ff=mac
END
let filename = 'Xunprintable'
call writefile(lines, filename)
call writefile(lines, filename, 'D')
let buf = RunVimInTerminal('-S '.filename, #{rows: 9, cols: 50})
call VerifyScreenDump(buf, 'Test_display_unprintable_01', {})
call term_sendkeys(buf, "\<C-W>\<C-W>\<C-L>")
@ -218,9 +214,6 @@ func Test_unprintable_fileformats()
" clean up
call StopVimInTerminal(buf)
call delete('Xunix.txt')
call delete('Xmac.txt')
call delete(filename)
endfunc
" Test for scrolling that modifies buffer during visual block
@ -299,19 +292,18 @@ func Test_display_scroll_update_visual()
call sign_place(2, 'bar', 'foo', bufnr(), { 'lnum': 1 })
autocmd CursorMoved * if getcurpos()[1] == 2 | call sign_unplace('bar', { 'id': 1 }) | endif
END
call writefile(lines, 'XupdateVisual.vim')
call writefile(lines, 'XupdateVisual.vim', 'D')
let buf = RunVimInTerminal('-S XupdateVisual.vim', #{rows: 8, cols: 60})
call term_sendkeys(buf, "VG7kk")
call VerifyScreenDump(buf, 'Test_display_scroll_update_visual', {})
call StopVimInTerminal(buf)
call delete('XupdateVisual.vim')
endfunc
" Test for 'eob' (EndOfBuffer) item in 'fillchars'
func Test_eob_fillchars()
" default value (skipped)
" default value
" call assert_match('eob:\~', &fillchars)
" invalid values
call assert_fails(':set fillchars=eob:', 'E474:')
@ -405,7 +397,7 @@ func Test_local_fillchars()
call setline(1, ['window 4']->repeat(3))
setlocal fillchars=stl:4,stlnc:d,vert:>,eob:o
END
call writefile(lines, 'Xdisplayfillchars')
call writefile(lines, 'Xdisplayfillchars', 'D')
let buf = RunVimInTerminal('-S Xdisplayfillchars', #{rows: 12})
call VerifyScreenDump(buf, 'Test_display_fillchars_1', {})
@ -413,7 +405,6 @@ func Test_local_fillchars()
call VerifyScreenDump(buf, 'Test_display_fillchars_2', {})
call StopVimInTerminal(buf)
call delete('Xdisplayfillchars')
endfunc
func Test_display_linebreak_breakat()