patch 9.1.1951: tests: Test_windows_external_cmd_in_cwd() only run in huge builds
Commit: https://github.com/vim/vim/commit/2c164f02c664b1b6d4743047914c53b0aea07161 Author: zeertzjq <[email protected]> Date: Wed Dec 3 20:10:07 2025 +0000 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 <[email protected]> Signed-off-by: Christian Brabandt <[email protected]> diff --git a/src/testdir/test_system.vim b/src/testdir/test_system.vim index 4e0c349ec..b4f5e688b 100644 --- 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 cb2ed5ebb..41ef3c5f6 100644 --- 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 046706edf..86bc9841b 100644 --- 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, /**/ -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion visit https://groups.google.com/d/msgid/vim_dev/E1vQtFe-00EpXE-W8%40256bit.org.
