diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-08 19:20:04 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-08 19:20:04 +0100 |
| commit | 8322e1f06e8fa39a6bb790a7d8d7db5d7aff3366 (patch) | |
| tree | 3b10bf2fbe951e8f2a5bd97bf86f74c85b3d1b0e | |
| parent | d9d473ea124339c4dd173127db47c4583645ac2c (diff) | |
| download | vim-git-8322e1f06e8fa39a6bb790a7d8d7db5d7aff3366.tar.gz | |
patch 7.4.1521v7.4.1521
Problem: File permission test fails on MS-Windows.
Solution: Expect a different permission.
| -rw-r--r-- | src/testdir/test_file_perm.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/testdir/test_file_perm.vim b/src/testdir/test_file_perm.vim index 44778ee97..0dba6a708 100644 --- a/src/testdir/test_file_perm.vim +++ b/src/testdir/test_file_perm.vim @@ -8,7 +8,11 @@ func Test_file_perm() call assert_true(len(getfperm('Xtest')) == 9) call assert_equal(1, setfperm('Xtest', 'rwx------')) - call assert_equal('rwx------', getfperm('Xtest')) + if has('win32') + call assert_equal('rw-rw-rw-', getfperm('Xtest')) + else + call assert_equal('rwx------', getfperm('Xtest')) + endif call assert_equal(1, setfperm('Xtest', 'r--r--r--')) call assert_equal('r--r--r--', getfperm('Xtest')) diff --git a/src/version.c b/src/version.c index 15baf5df9..5d7a968da 100644 --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1521, +/**/ 1520, /**/ 1519, |