patch 9.1.1693: tests: test_filetype fails in shadow dir

Problem:  tests: test_filetype fails in shadow dir
          (after v9.1.9.1.1687)
Solution: Use a custom test that does not rely on configure.ac
          being existing in the upper directory tree.

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 42e4cbcde4ac5c26a534735c9557080b939bed90..43d103908d2e24e79bd2531b31d05878123d1343 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -191,7 +191,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     coco: ['file.atg'],
     conaryrecipe: ['file.recipe'],
     conf: ['auto.master', 'file.conf', 'texdoc.cnf', '.x11vncrc', '.chktexrc', '.ripgreprc', 'ripgreprc', 'file.ctags'],
-    config: ['/etc/hostname.file', 'any/etc/hostname.file', 'configure.in', 'configure.ac', 'alocal.m4', 'file.at'],
+    config: ['/etc/hostname.file', 'any/etc/hostname.file', 'configure.in', 'configure.ac', 'file.at'],
     confini: ['pacman.conf', 'paru.conf', 'mpv.conf', 'any/.aws/config', 'any/.aws/credentials', 'file.nmconnection',
               'any/.gnuradio/grc.conf', 'any/gnuradio/config.conf', 'any/gnuradio/conf.d/modtool.conf'],
     context: ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi', 'file.mkxl', 'file.mklx'],
@@ -3147,4 +3147,23 @@ func Test_diff_format()
   filetype off
 endfunc
 
+func Test_m4_format()
+  filetype on
+
+  call mkdir('Xm4', 'D')
+  cd Xm4
+  call writefile([''], 'alocal.m4', 'D')
+  split alocal.m4
+  call assert_equal('m4', &filetype)
+  bwipe!
+  " an accompanying configure.ac in the current directory changes the filetype
+  call writefile([''], 'configure.ac')
+  split alocal.m4
+  call assert_equal('config', &filetype)
+  bwipe!
+
+  cd -
+  filetype off
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/version.c b/src/version.c
index ec3bcc5deca19a3801e34a2cfcee696974bf29fe..4993aa8d451757ee615020528ff7d442a5260ce6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1693,
 /**/
     1692,
 /**/