diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-02-07 21:27:14 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-02-07 21:27:14 +0100 |
| commit | a02e3f65c52a2c8c987e7dcac5df1f8db9a7b0de (patch) | |
| tree | 9c88a77d0777cb3672dd8ab0d99043bfe668be68 | |
| parent | ee8188fc74a7cf9ee7acb634b2bb7a032d0cb24c (diff) | |
patch 8.1.0878: test for has('bsd') fails on some BSD systemsv8.1.0878
Problem: Test for has('bsd') fails on some BSD systems.
Solution: Adjust the uname match. (James McCoy, closes #3909)
| -rw-r--r-- | src/testdir/test_functions.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index b08d9aa856..e75a8965a0 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -1238,6 +1238,8 @@ func Test_platform_name() let uname = system('uname') call assert_equal(uname =~? 'BeOS', has('beos')) call assert_equal(uname =~? 'BSD\|DragonFly', has('bsd')) + " GNU userland on BSD kernels (e.g., GNU/kFreeBSD) don't have BSD defined + call assert_equal(uname =~? '\%(GNU/k\w\+\)\@<!BSD\|DragonFly', has('bsd')) call assert_equal(uname =~? 'HP-UX', has('hpux')) call assert_equal(uname =~? 'Linux', has('linux')) call assert_equal(uname =~? 'Darwin', has('mac')) diff --git a/src/version.c b/src/version.c index 3ad7869b40..6a8ba37551 100644 --- a/src/version.c +++ b/src/version.c @@ -784,6 +784,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 878, +/**/ 877, /**/ 876, |