patch 9.0.0538: manually deleting test temp files

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

diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim
index 33ab45fcd4a16e6fa59e34d1df278e963abef02b..46ec12df16a639a6aa7307f1c5488d1ee5ec9748 100644 (file)
--- a/src/testdir/test_eval_stuff.vim
+++ b/src/testdir/test_eval_stuff.vim
@@ -25,7 +25,7 @@ func Test_nocatch_restore_silent_emsg()
 endfunc
 
 func Test_mkdir_p()
-  call mkdir('Xmkdir/nested', 'p')
+  call mkdir('Xmkdir/nested', 'pR')
   call assert_true(isdirectory('Xmkdir/nested'))
   try
     " Trying to make existing directories doesn't error
@@ -35,10 +35,9 @@ func Test_mkdir_p()
     call assert_report('mkdir(..., "p") failed for an existing directory')
   endtry
   " 'p' doesn't suppress real errors
-  call writefile([], 'Xmkdirfile')
+  call writefile([], 'Xmkdirfile', 'D')
   call assert_fails('call mkdir("Xmkdirfile", "p")', 'E739:')
-  call delete('Xmkdirfile')
-  call delete('Xmkdir', 'rf')
+
   call assert_equal(0, mkdir(test_null_string()))
   call assert_fails('call mkdir([])', 'E730:')
   call assert_fails('call mkdir("abc", [], [])', 'E745:')
@@ -160,11 +159,9 @@ func Test_for_invalid_line_count()
       111111111111111111111111 for line in ['one']
       endfor
   END
-  call writefile(lines, 'XinvalidFor')
+  call writefile(lines, 'XinvalidFor', 'D')
   " only test that this doesn't crash
   call RunVim([], [], '-u NONE -e -s -S XinvalidFor -c qa')
-
-  call delete('XinvalidFor')
 endfunc
 
 func Test_readfile_binary()
@@ -186,10 +183,9 @@ func Test_readfile_binary()
 endfunc
 
 func Test_readfile_binary_empty()
-  call writefile([], 'Xempty-file')
+  call writefile([], 'Xempty-file', 'D')
   " This used to compare uninitialized memory in Vim <= 8.2.4065
   call assert_equal([''], readfile('Xempty-file', 'b'))
-  call delete('Xempty-file')
 endfunc
 
 func Test_readfile_bom()
@@ -199,10 +195,9 @@ func Test_readfile_bom()
 endfunc
 
 func Test_readfile_max()
-  call writefile(range(1, 4), 'XReadfile_max')
+  call writefile(range(1, 4), 'XReadfile_max', 'D')
   call assert_equal(['1', '2'], readfile('XReadfile_max', '', 2))
   call assert_equal(['3', '4'], readfile('XReadfile_max', '', -2))
-  call delete('XReadfile_max')
 endfunc
 
 func Test_let_errmsg()
@@ -336,9 +331,8 @@ func Test_vvar_scriptversion1()
 endfunc
 
 func Test_scriptversion_fail()
-  call writefile(['scriptversion 9'], 'Xversionscript')
+  call writefile(['scriptversion 9'], 'Xversionscript', 'D')
   call assert_fails('source Xversionscript', 'E999:')
-  call delete('Xversionscript')
 endfunc
 
 func Test_execute_cmd_with_null()

diff --git a/src/testdir/test_ex_mode.vim b/src/testdir/test_ex_mode.vim
index 2e14e01fa3d53a3687791a41e42b496140240f63..a6602227638a1a5f99d034c158da76a4edbb3462 100644 (file)
--- a/src/testdir/test_ex_mode.vim
+++ b/src/testdir/test_ex_mode.vim
@@ -237,13 +237,12 @@ func Test_ex_mode_with_global()
     call writefile(['done'], 'Xdidexmode')
     qall!
   END
-  call writefile(lines, 'Xexmodescript')
+  call writefile(lines, 'Xexmodescript', 'D')
   call assert_equal(1, RunVim([], [], '-e -s -S Xexmodescript'))
   call assert_equal(['done'], readfile('Xdidexmode'))
 
   call delete('logfile')
   call delete('Xdidexmode')
-  call delete('Xexmodescript')
 endfunc
 
 func Test_ex_mode_count_overflow()
@@ -257,12 +256,11 @@ func Test_ex_mode_count_overflow()
     call writefile(['done'], 'Xdidexmode')
     qall!
   END
-  call writefile(lines, 'Xexmodescript')
+  call writefile(lines, 'Xexmodescript', 'D')
   call assert_equal(1, RunVim([], [], '-e -s -S Xexmodescript -c qa'))
   call assert_equal(['done'], readfile('Xdidexmode'))
 
   call delete('Xdidexmode')
-  call delete('Xexmodescript')
 endfunc
 
 func Test_ex_mode_large_indent()
@@ -281,11 +279,9 @@ func Test_empty_command_visual_mode()
       0norm0V:\e
       :qall!
   END
-  call writefile(lines, 'Xexmodescript')
+  call writefile(lines, 'Xexmodescript', 'D')
   call assert_equal(1, RunVim([], [], '-u NONE -e -s -S Xexmodescript'))
 
-  call delete('Xexmodescript')
-
   " This may cause a dialog to be displayed for an empty command, ignore it.
   call delete('guidialogfile')
 endfunc

diff --git a/src/testdir/test_excmd.vim b/src/testdir/test_excmd.vim
index a56676ef5a258a2e3560da41bad757250a906481..3637351f636c0214cbc40f679facbbaad5aceca9 100644 (file)
--- a/src/testdir/test_excmd.vim
+++ b/src/testdir/test_excmd.vim
@@ -83,7 +83,7 @@ endfunc
 
 " Test for the :drop command
 func Test_drop_cmd()
-  call writefile(['L1', 'L2'], 'Xdropfile')
+  call writefile(['L1', 'L2'], 'Xdropfile', 'D')
   enew | only
   drop Xdropfile
   call assert_equal('L2', getline(2))
@@ -99,7 +99,6 @@ func Test_drop_cmd()
   " Check for setting the argument list
   call assert_equal(['Xdropfile'], argv())
   enew | only!
-  call delete('Xdropfile')
 endfunc
 
 " Test for the :append command
@@ -141,14 +140,13 @@ func Test_append_cmd_empty_buf()
     endfunc
     call timer_start(10, 'Timer')
   END
-  call writefile(lines, 'Xtest_append_cmd_empty_buf')
+  call writefile(lines, 'Xtest_append_cmd_empty_buf', 'D')
   let buf = RunVimInTerminal('-S Xtest_append_cmd_empty_buf', {'rows': 6})
   call WaitForAssert({-> assert_equal('bbbbb', term_getline(buf, 2))})
   call WaitForAssert({-> assert_equal('aaaaa', term_getline(buf, 1))})
 
   " clean up
   call StopVimInTerminal(buf)
-  call delete('Xtest_append_cmd_empty_buf')
 endfunc
 
 " Test for the :insert command
@@ -190,14 +188,13 @@ func Test_insert_cmd_empty_buf()
     endfunc
     call timer_start(10, 'Timer')
   END
-  call writefile(lines, 'Xtest_insert_cmd_empty_buf')
+  call writefile(lines, 'Xtest_insert_cmd_empty_buf', 'D')
   let buf = RunVimInTerminal('-S Xtest_insert_cmd_empty_buf', {'rows': 6})
   call WaitForAssert({-> assert_equal('bbbbb', term_getline(buf, 2))})
   call WaitForAssert({-> assert_equal('aaaaa', term_getline(buf, 1))})
 
   " clean up
   call StopVimInTerminal(buf)
-  call delete('Xtest_insert_cmd_empty_buf')
 endfunc
 
 " Test for the :change command
@@ -241,8 +238,8 @@ func Test_confirm_cmd()
   CheckNotGui
   CheckRunVimInTerminal
 
-  call writefile(['foo1'], 'Xfoo')
-  call writefile(['bar1'], 'Xbar')
+  call writefile(['foo1'], 'Xfoo', 'D')
+  call writefile(['bar1'], 'Xbar', 'D')
 
   " Test for saving all the modified buffers
   let lines =<< trim END
@@ -253,7 +250,7 @@ func Test_confirm_cmd()
     call setline(1, 'bar2')
     wincmd b
   END
-  call writefile(lines, 'Xscript')
+  call writefile(lines, 'Xscript', 'D')
   let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
   call term_sendkeys(buf, ":confirm qall\n")
   call WaitForAssert({-> assert_match('\[Y\]es, (N)o, Save (A)ll, (D)iscard All, (C)ancel: ', term_getline(buf, 20))}, 1000)
@@ -302,10 +299,6 @@ func Test_confirm_cmd()
 
   call assert_equal(['foo4'], readfile('Xfoo'))
   call assert_equal(['bar2'], readfile('Xbar'))
-
-  call delete('Xscript')
-  call delete('Xfoo')
-  call delete('Xbar')
 endfunc
 
 func Test_confirm_cmd_cancel()
@@ -318,7 +311,7 @@ func Test_confirm_cmd_cancel()
     new
     call setline(1, 'abc')
   END
-  call writefile(lines, 'Xscript')
+  call writefile(lines, 'Xscript', 'D')
   let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
   call term_sendkeys(buf, ":confirm close\n")
   call WaitForAssert({-> assert_match('^\[Y\]es, (N)o, (C)ancel: *$',
@@ -332,7 +325,6 @@ func Test_confirm_cmd_cancel()
   call WaitForAssert({-> assert_match('^ *0,0-1         All$',
         \ term_getline(buf, 20))}, 1000)
   call StopVimInTerminal(buf)
-  call delete('Xscript')
 endfunc
 
 " The ":confirm" prompt was sometimes used with the terminal in cooked mode.
@@ -342,14 +334,14 @@ func Test_confirm_q_wq()
   CheckNotGui
   CheckRunVimInTerminal
 
-  call writefile(['foo'], 'Xfoo')
+  call writefile(['foo'], 'Xfoo', 'D')
 
   let lines =<< trim END
     set hidden nomore
     call setline(1, 'abc')
     edit Xfoo
   END
-  call writefile(lines, 'Xscript')
+  call writefile(lines, 'Xscript', 'D')
   let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
   call term_sendkeys(buf, ":confirm q\n")
   call WaitForAssert({-> assert_match('^\[Y\]es, (N)o, (C)ancel: *$',
@@ -365,23 +357,21 @@ func Test_confirm_q_wq()
   call term_sendkeys(buf, 'C')
   call WaitForAssert({-> assert_notmatch('^\[Y\]es, (N)o, (C)ancel: C*$',
         \ term_getline(buf, 20))}, 1000)
-  call StopVimInTerminal(buf)
 
-  call delete('Xscript')
-  call delete('Xfoo')
+  call StopVimInTerminal(buf)
 endfunc
 
 func Test_confirm_write_ro()
   CheckNotGui
   CheckRunVimInTerminal
 
-  call writefile(['foo'], 'Xconfirm_write_ro')
+  call writefile(['foo'], 'Xconfirm_write_ro', 'D')
   let lines =<< trim END
     set nobackup ff=unix cmdheight=2
     edit Xconfirm_write_ro
     norm Abar
   END
-  call writefile(lines, 'Xscript')
+  call writefile(lines, 'Xscript', 'D')
   let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
 
   " Try to write with 'ro' option.
@@ -422,17 +412,15 @@ func Test_confirm_write_ro()
   call assert_equal(['foo'], readfile('Xconfirm_write_ro'))
 
   call StopVimInTerminal(buf)
-  call delete('Xscript')
-  call delete('Xconfirm_write_ro')
 endfunc
 
 func Test_confirm_write_partial_file()
   CheckNotGui
   CheckRunVimInTerminal
 
-  call writefile(['a', 'b', 'c', 'd'], 'Xwrite_partial')
+  call writefile(['a', 'b', 'c', 'd'], 'Xwrite_partial', 'D')
   call writefile(['set nobackup ff=unix cmdheight=2',
-        \         'edit Xwrite_partial'], 'Xscript')
+        \         'edit Xwrite_partial'], 'Xscript', 'D')
   let buf = RunVimInTerminal('-S Xscript', {'rows': 20})
 
   call term_sendkeys(buf, ":confirm 2,3w\n")
@@ -458,8 +446,6 @@ func Test_confirm_write_partial_file()
   call assert_equal(['b', 'c'], readfile('Xwrite_partial'))
 
   call StopVimInTerminal(buf)
-  call delete('Xwrite_partial')
-  call delete('Xscript')
 endfunc
 
 " Test for the :print command
@@ -509,10 +495,9 @@ func Test_redir_cmd_readonly()
   CheckNotRoot
 
   " Redirecting to a read-only file
-  call writefile([], 'Xredirfile')
+  call writefile([], 'Xredirfile', 'D')
   call setfperm('Xredirfile', 'r--r--r--')
   call assert_fails('redir! > Xredirfile', 'E190:')
-  call delete('Xredirfile')
 endfunc
 
 " Test for the :filetype command
@@ -532,7 +517,7 @@ endfunc
 
 " Test for the :read command
 func Test_read_cmd()
-  call writefile(['one'], 'Xcmdfile')
+  call writefile(['one'], 'Xcmdfile', 'D')
   new
   call assert_fails('read', 'E32:')
   edit Xcmdfile
@@ -546,7 +531,6 @@ func Test_read_cmd()
   call feedkeys("Qr Xcmdfile\<CR>visual\<CR>", 'xt')
   call assert_equal(['one'], getline(1, '$'))
   close!
-  call delete('Xcmdfile')
 endfunc
 
 " Test for running Ex commands when text is locked.
@@ -727,7 +711,7 @@ endfunc
 
 " Test :write after changing name with :file and loading it with :edit
 func Test_write_after_rename()
-  call writefile(['text'], 'Xafterfile')
+  call writefile(['text'], 'Xafterfile', 'D')
 
   enew
   file Xafterfile
@@ -737,7 +721,6 @@ func Test_write_after_rename()
   edit
   write
 
-  call delete('Xafterfile')
   bwipe!
 endfunc
 

diff --git a/src/testdir/test_execute_func.vim b/src/testdir/test_execute_func.vim
index b25f211f8b935bd11ea2bb539b15ff2bb6ba0c63..09b976bac0705184331ac560e64875a90895e21e 100644 (file)
--- a/src/testdir/test_execute_func.vim
+++ b/src/testdir/test_execute_func.vim
@@ -183,13 +183,12 @@ func Test_win_execute_on_startup()
       silent tabedit Xfile3
       autocmd VimEnter * win_execute(id, 'close')
   END
-  call writefile(lines, 'XwinExecute')
+  call writefile(lines, 'XwinExecute', 'D')
   let buf = RunVimInTerminal('-p Xfile1 -Nu XwinExecute', {})
 
   " this was crashing on exit with EXITFREE defined
   call StopVimInTerminal(buf)
 
-  call delete('XwinExecute')
   call delete('Xfile1')
 endfunc
 

diff --git a/src/testdir/test_exit.vim b/src/testdir/test_exit.vim
index a7596e10190430487ba3c5e7ae2ad9f2cc595f83..9e9370eee1edd6fd3744a5a5481c3688c546999f 100644 (file)
--- a/src/testdir/test_exit.vim
+++ b/src/testdir/test_exit.vim
@@ -117,13 +117,12 @@ func Test_exit_error_reading_input()
   CheckNotAsan
   CheckNotValgrind
 
-  call writefile([":au VimLeave * call writefile(['l = ' .. v:exiting], 'Xtestout')", ":tabnew", "q:"], 'Xscript', 'b')
+  call writefile([":au VimLeave * call writefile(['l = ' .. v:exiting], 'Xtestout')", ":tabnew", "q:"], 'Xscript', 'bD')
 
   if RunVim([], [], '<Xscript')
     call assert_equal(1, v:shell_error)
     call assert_equal(['l = 1'], readfile('Xtestout'))
   endif
-  call delete('Xscript')
   call delete('Xtestout')
 endfun
 

diff --git a/src/testdir/test_expand.vim b/src/testdir/test_expand.vim
index 8f2fab69eacb834c9c2b96244b052c940d684dd8..c1140aaabb182b8a36723c896f5939f3103fe900 100644 (file)
--- a/src/testdir/test_expand.vim
+++ b/src/testdir/test_expand.vim
@@ -137,14 +137,13 @@ func Test_source_sfile()
     :call writefile(v:errors, 'Xresult')
     :qall!
   [SCRIPT]
-  call writefile(lines, 'Xscript')
+  call writefile(lines, 'Xscript', 'D')
   if RunVim([], [], '--clean -s Xscript')
     call assert_equal([
           \ 'E1274: No script file name to substitute for "<script>"',
           \ 'E498: No :source file name to substitute for "<sfile>"'],
           \ readfile('Xresult'))
   endif
-  call delete('Xscript')
   call delete('Xresult')
 endfunc
 
@@ -197,9 +196,9 @@ func Test_expand_script_source()
     au User * call extend(g:au_level, [expand('<script>:t')])
   [SCRIPT]
 
-  call writefile(lines0, 'Xscript0')
-  call writefile(lines1, 'Xscript1')
-  call writefile(lines2, 'Xscript2')
+  call writefile(lines0, 'Xscript0', 'D')
+  call writefile(lines1, 'Xscript1', 'D')
+  call writefile(lines2, 'Xscript2', 'D')
 
   " Check the expansion of <script> at different levels.
   let g:script_level = []
@@ -220,10 +219,6 @@ func Test_expand_script_source()
   delfunc F0
   delfunc F1
   delfunc F2
-
-  call delete('Xscript0')
-  call delete('Xscript1')
-  call delete('Xscript2')
 endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/testdir/test_expand_func.vim b/src/testdir/test_expand_func.vim
index 454d76f0aa4d6a1e8eee560f73772e7c577a8cfe..c9e802a1e0b142006e243ef3319e8aef58917a83 100644 (file)
--- a/src/testdir/test_expand_func.vim
+++ b/src/testdir/test_expand_func.vim
@@ -56,14 +56,13 @@ func Test_expand_sfile_and_stack()
     " comment here
     let g:stack_value = expand('<stack>')
   END
-  call writefile(lines, 'Xstack')
+  call writefile(lines, 'Xstack', 'D')
   source Xstack
   call assert_match('\<Xstack\[2\]$', g:stack_value)
   unlet g:stack_value
-  call delete('Xstack')
 
   if exists('+shellslash')
-    call mkdir('Xshellslash')
+    call mkdir('Xshellslash', 'R')
     let lines =<< trim END
       let g:stack1 = expand('<stack>')
       set noshellslash
@@ -83,7 +82,6 @@ func Test_expand_sfile_and_stack()
       unlet g:stack2
       unlet g:stack3
     endfor
-    call delete('Xshellslash', 'rf')
   endif
 endfunc
 

diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim
index 8e2345d7f4943c79576a3cff67b801666329e2cb..b47896340f6059ebc7be84f66a7864d6f62dcf2d 100644 (file)
--- a/src/testdir/test_expr.vim
+++ b/src/testdir/test_expr.vim
@@ -706,13 +706,12 @@ func Test_function_outside_script()
     call writefile([execute('messages')], 'Xtest.out')
     qall
   END
-  call writefile(cleanup, 'Xverify.vim')
+  call writefile(cleanup, 'Xverify.vim', 'D')
   call RunVim([], [], "-c \"echo function('s:abc')\" -S Xverify.vim")
   call assert_match('E81: Using <SID> not in a', readfile('Xtest.out')[0])
   call RunVim([], [], "-c \"echo funcref('s:abc')\" -S Xverify.vim")
   call assert_match('E81: Using <SID> not in a', readfile('Xtest.out')[0])
   call delete('Xtest.out')
-  call delete('Xverify.vim')
 endfunc
 
 func Test_setmatches()

diff --git a/src/version.c b/src/version.c
index e6045d7cab913285602ecfde2e13be40d396dac9..0bbeae6c08305766e47b5fa47488128cc54e999a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    538,
 /**/
     537,
 /**/