diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-04-07 14:10:48 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-04-07 14:10:48 +0200 |
| commit | 15ecbd6f3d39ff04862999a577962ef9369a9e53 (patch) | |
| tree | fbf14224edbc3814bdbb05a914d231a331f60193 | |
| parent | 866c68861071f8cd1ef5a82445bebaafc8626e7e (diff) | |
patch 8.0.0545: edit test may fail on some systemsv8.0.0545
Problem: Edit test may fail on some systems.
Solution: If creating a directory with a very long path fails, bail out.
| -rw-r--r-- | src/testdir/test_edit.vim | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim index 2df0d6f242..0986bf9b1c 100644 --- a/src/testdir/test_edit.vim +++ b/src/testdir/test_edit.vim @@ -1324,22 +1324,31 @@ func! Test_edit_rightleft() endfunc func Test_edit_complete_very_long_name() - if !has('unix') || has('mac') + if !has('unix') " Long directory names only work on Unix. return endif + + let dirname = getcwd() . "/Xdir" + let longdirname = dirname . repeat('/' . repeat('d', 255), 4) + try + call mkdir(longdirname, 'p') + catch /E739:/ + " Long directory name probably not supported. + call delete(dirname, 'rf') + return + endtry + " Try to get the Vim window position before setting 'columns'. let winposx = getwinposx() let winposy = getwinposy() let save_columns = &columns + " Need at least about 1100 columns to reproduce the problem. set columns=2000 call assert_equal(2000, &columns) set noswapfile - let dirname = getcwd() . "/Xdir" - let longdirname = dirname . repeat('/' . repeat('d', 255), 4) let longfilename = longdirname . '/' . repeat('a', 255) - call mkdir(longdirname, 'p') call writefile(['Totum', 'Table'], longfilename) new exe "next Xfile " . longfilename diff --git a/src/version.c b/src/version.c index 9db3ea007c..4d386eebcf 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 545, +/**/ 544, /**/ 543, |