patch 9.1.1951: tests: Test_windows_external_cmd_in_cwd() only run in huge builds

Problem:  tests: Test_windows_external_cmd_in_cwd() is only run in huge
          builds (after 9.1.1947).
Solution: Move it to test_system.vim so that it is run in normal builds.

closes: #18853

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

diff --git a/src/testdir/test_system.vim b/src/testdir/test_system.vim
index 4e0c349ec83b857ddfc27294970b34317ad6d724..b4f5e688b61292d2b342326961fb2a1fc6db98d2 100644 (file)
--- a/src/testdir/test_system.vim
+++ b/src/testdir/test_system.vim
@@ -140,4 +140,42 @@ func Test_system_with_shell_quote()
   endtry
 endfunc
 
+" Check that Vim does not execute anything from current directory
+func Test_windows_external_cmd_in_cwd()
+  CheckMSWindows
+
+  " just in case
+  call system('rd /S /Q Xfolder')
+  call mkdir('Xfolder', 'R')
+  cd Xfolder
+
+  let contents = ['@echo off', 'echo filename1.txt:1:AAAA']
+  call writefile(contents, 'findstr.cmd')
+
+  let file1 = ['AAAA', 'THIS FILE SHOULD NOT BE FOUND']
+  let file2 = ['BBBB', 'THIS FILE SHOULD BE FOUND']
+
+  call writefile(file1, 'filename1.txt')
+  call writefile(file2, 'filename2.txt')
+
+  if has('quickfix')
+    " use silent to avoid hit-enter-prompt
+    sil grep BBBB filename*.txt
+    call assert_equal('filename2.txt', @%)
+  endif
+
+  let output = system('findstr BBBB filename*')
+  " Match trailing newline byte
+  call assert_match('filename2.txt:BBBB.', output)
+
+  if has('gui')
+    set guioptions+=!
+    let output = system('findstr BBBB filename*')
+    call assert_match('filename2.txt:BBBB.', output)
+  endif
+
+  cd -
+  set guioptions&
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/testdir/test_terminal2.vim b/src/testdir/test_terminal2.vim
index cb2ed5ebb995af43c56cfe27aaee2189c5dab15a..41ef3c5f66fda657ad8c4cc43d2899b2de1fd7e5 100644 (file)
--- a/src/testdir/test_terminal2.vim
+++ b/src/testdir/test_terminal2.vim
@@ -740,40 +740,4 @@ func Test_term_gettty()
   exe buf . 'bwipe'
 endfunc
 
-func Test_windows_external_cmd_in_cwd()
-  " Check that Vim does not execute anything from current directory
-  CheckMSWindows
-
-  " just in case
-  call system('rd /S /Q Xfolder')
-  call mkdir('Xfolder', 'R')
-  cd Xfolder
-
-  let contents = ['@echo off', 'echo filename1.txt:1:AAAA']
-  call writefile(contents, 'findstr.cmd')
-
-  let file1 = ['AAAA', 'THIS FILE SHOULD NOT BE FOUND']
-  let file2 = ['BBBB', 'THIS FILE SHOULD BE FOUND']
-
-  call writefile(file1, 'filename1.txt')
-  call writefile(file2, 'filename2.txt')
-
-  " use silent to avoid hit-enter-prompt
-  sil grep BBBB filename*.txt
-
-  call assert_equal('filename2.txt', @%)
-
-  let output = system('findstr BBBB filename*')
-  " Match trailing newline byte
-  call assert_match('filename2.txt:BBBB.', output)
-
-  set guioptions+=!
-
-  let output = system('findstr BBBB filename*')
-  call assert_match('filename2.txt:BBBB.', output)
-
-  cd -
-  set guioptions&
-endfunc
-
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/version.c b/src/version.c
index 046706edfc52d05bc698a3d33c407c7292904e9d..86bc9841b1ee1dcc08570b005491c4c14b85f044 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1951,
 /**/
     1950,
 /**/