diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-07-20 00:03:18 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-07-20 00:03:18 +0200 |
| commit | 53bdec2ac9b994eee9c60f2ab9ad8a8afb2b9594 (patch) | |
| tree | 30003f8756765fc1913aa3f1da72023fea9ad8ab | |
| parent | ca8942c6e331a69ddd533dd78931f399f7dcaa79 (diff) | |
| download | vim-git-53bdec2ac9b994eee9c60f2ab9ad8a8afb2b9594.tar.gz | |
patch 7.4.2079v7.4.2079
Problem: Netbeans test fails on non-Unix systems.
Solution: Only do the permission check on Unix systems.
| -rw-r--r-- | src/testdir/test_netbeans.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim index d47916838..240271e7a 100644 --- a/src/testdir/test_netbeans.vim +++ b/src/testdir/test_netbeans.vim @@ -53,8 +53,10 @@ endfunc func Nb_file_auth(port) call assert_fails('nbstart =notexist', 'E660:') call writefile(['host=localhost', 'port=' . a:port, 'auth=bunny'], 'Xnbauth') - call setfperm('Xnbauth', "rw-r--r--") - call assert_fails('nbstart =Xnbauth', 'E668:') + if has('unix') + call setfperm('Xnbauth', "rw-r--r--") + call assert_fails('nbstart =Xnbauth', 'E668:') + endif call setfperm('Xnbauth', "rw-------") exe 'nbstart :localhost:' . a:port . ':bunny' call assert_true(has("netbeans_enabled")) diff --git a/src/version.c b/src/version.c index c3443fe26..febea0a3d 100644 --- a/src/version.c +++ b/src/version.c @@ -759,6 +759,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2079, +/**/ 2078, /**/ 2077, |