diff options
| -rw-r--r-- | src/testdir/test_shortpathname.vim | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 17 insertions, 5 deletions
diff --git a/src/testdir/test_shortpathname.vim b/src/testdir/test_shortpathname.vim index 13fc07999d..79b7899c86 100644 --- a/src/testdir/test_shortpathname.vim +++ b/src/testdir/test_shortpathname.vim @@ -19,12 +19,22 @@ endfunc func Test_ColonEight() let save_dir = getcwd() - " This could change for CygWin to //cygdrive/c + " This could change for CygWin to //cygdrive/c . let dir1 = 'c:/x.x.y' - if filereadable(dir1) || isdirectory(dir1) - call assert_report("Fatal: '" . dir1 . "' exists, cannot run test") - return - endif + let trycount = 5 + while 1 + if !filereadable(dir1) && !isdirectory(dir1) + break + endif + if trycount == 1 + call assert_report("Fatal: '" . dir1 . "' exists, cannot run this test") + return + endif + " When tests run in parallel the directory may exist, wait a bit until it + " is gone. + sleep 5 + let trycount -= 1 + endwhile let file1 = dir1 . '/zz.y.txt' let nofile1 = dir1 . '/z.y.txt' diff --git a/src/version.c b/src/version.c index 3ba672db5d..4a79784b29 100644 --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 112, +/**/ 111, /**/ 110, |