From 07382048b0b9a767a041587ed23d822da21aaa26 Mon Sep 17 00:00:00 2001 From: Jurica Bradaric Date: Thu, 19 May 2016 22:40:21 +0200 Subject: [PATCH] vim-patch:7.4.1521 Problem: File permission test fails on MS-Windows. Solution: Expect a different permission. https://github.com/vim/vim/commit/8322e1f06e8fa39a6bb790a7d8d7db5d7aff3366 --- src/nvim/version.c | 2 +- test/functional/legacy/file_perm_spec.lua | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/nvim/version.c b/src/nvim/version.c index 14582723d2..bb03babf5c 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -163,7 +163,7 @@ static int included_patches[] = { // 1524 NA // 1523 NA // 1522 NA - // 1521, + 1521, // 1520 NA // 1519 NA // 1518 NA diff --git a/test/functional/legacy/file_perm_spec.lua b/test/functional/legacy/file_perm_spec.lua index 1356625890..0965ebe0bc 100644 --- a/test/functional/legacy/file_perm_spec.lua +++ b/test/functional/legacy/file_perm_spec.lua @@ -21,7 +21,11 @@ describe('Test getting and setting file permissions', function() eq(9, call('len', call('getfperm', tempfile))) eq(1, call('setfperm', tempfile, 'rwx------')) - eq('rwx------', call('getfperm', tempfile)) + if helpers.os_name == 'windows' then + eq('rwx------', call('getfperm', tempfile)) + else + eq('rwx------', call('getfperm', tempfile)) + end eq(1, call('setfperm', tempfile, 'r--r--r--')) eq('r--r--r--', call('getfperm', tempfile))