From 03ca4002c1dcd34c4b17fe4a491b02d77ec2c887 Mon Sep 17 00:00:00 2001 From: Ken Takata Date: Thu, 28 Sep 2023 21:59:58 +0200 Subject: [PATCH] patch 9.0.1947: Bash Expansion test fails on Windows/MacOS Problem: Bash Expansion test fails on Windows/MacOS Solution: Disable Test_glob_extended_bash for now This test doesn't work on Windows even if bash can be executed, since the globstar functionality has only been enabled in Unix builds of Vim (Commit 9eb1ce531527a7177d16373b0f8689bbcd3d5f73, patch 9.0.1946). closes: #13205 Signed-off-by: Christian Brabandt Co-authored-by: Ken Takata --- src/testdir/test_functions.vim | 3 +++ src/version.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index 4ec4666855..a467e3dc4b 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -3628,6 +3628,9 @@ endfunc " Test for glob() with shell special patterns func Test_glob_extended_bash() CheckExecutable bash + CheckNotMSWindows + CheckNotMac " The default version of bash is old on macOS. + let _shell = &shell set shell=bash diff --git a/src/version.c b/src/version.c index d54df70ba5..fb1b307138 100644 --- a/src/version.c +++ b/src/version.c @@ -699,6 +699,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1947, /**/ 1946, /**/