diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-09 13:02:10 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-09 13:02:10 +0200 |
| commit | 730b24833952f0f4a9a17b7815b0d9f87c609eb8 (patch) | |
| tree | 6fc5ce1aec13879e03f84307956151f6d44fadc3 /src | |
| parent | efa94447e85eacce62c1fcf6b63e7f3431e2cb1b (diff) | |
| download | vim-git-730b24833952f0f4a9a17b7815b0d9f87c609eb8.tar.gz | |
patch 8.2.1400: Vim9: test does not delete written filesv8.2.1400
Problem: Vim9: test does not delete written files.
Solution: Correct file names.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 226d07e9a..6c04316bc 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -1395,7 +1395,7 @@ def Test_import_export_expr_map() nnoremap <expr> trigger g:Trigger() feedkeys('trigger', "xt") - delete('Xexport.vim') + delete('Xexport_that.vim') delete('Ximport.vim') nunmap trigger enddef @@ -1407,11 +1407,11 @@ def Test_import_in_filetype() vim9script export let That = 'yes' END - writefile(export_lines, 'ftplugin/Xexport_that.vim') + writefile(export_lines, 'ftplugin/Xexport_ft.vim') let import_lines =<< trim END vim9script - import That from './Xexport_that.vim' + import That from './Xexport_ft.vim' assert_equal('yes', That) g:did_load_mytpe = 1 END @@ -1425,7 +1425,7 @@ def Test_import_in_filetype() assert_equal(1, g:did_load_mytpe) quit! - delete('Xexport.vim') + delete('Xexport_ft.vim') delete('ftplugin', 'rf') &rtp = save_rtp enddef @@ -1484,13 +1484,13 @@ def Run_Test_import_fails_on_command_line() return 0 enddef END - writefile(export, 'Xexport.vim') + writefile(export, 'XexportCmd.vim') - let buf = RunVimInTerminal('-c "import Foo from ''./Xexport.vim''"', #{ + let buf = RunVimInTerminal('-c "import Foo from ''./XexportCmd.vim''"', #{ rows: 6, wait_for_ruler: 0}) WaitForAssert({-> assert_match('^E1094:', term_getline(buf, 5))}) - delete('Xexport.vim') + delete('XexportCmd.vim') StopVimInTerminal(buf) enddef diff --git a/src/version.c b/src/version.c index a85d54de0..20e8b36b8 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1400, +/**/ 1399, /**/ 1398, |