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 <cb@256bit.org>
Co-authored-by: Ken Takata <kentkt@csc.jp>

diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 4ec466685588cc10af6461a152d14d16b66d3a47..a467e3dc4b1d109503753f26ada654d492ab4da1 100644 (file)
--- 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 d54df70ba5ef0ca5b041feb85da5f6b89d5f82c0..fb1b307138dd34b65562f012caf7fb16eda78c16 100644 (file)
--- 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,
 /**/