summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Takata <kentkt@csc.jp>2023-09-28 21:59:58 +0200
committerChristian Brabandt <cb@256bit.org>2023-09-28 21:59:58 +0200
commit03ca4002c1dcd34c4b17fe4a491b02d77ec2c887 (patch)
tree4a0639bfc3190a2ff40cae987b2b9921a91fb8cd
parente845b38dab2e79c1e5d54dc492a43e43156a1eaa (diff)
patch 9.0.1947: Bash Expansion test fails on Windows/MacOSv9.0.1947
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 <cb@256bit.org> Co-authored-by: Ken Takata <kentkt@csc.jp>
-rw-r--r--src/testdir/test_functions.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
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
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1947,
+/**/
1946,
/**/
1945,