0
0
mirror of https://github.com/vim/vim.git synced 2025-09-06 21:53:38 -04:00

patch 9.1.0794: tests: tests may fail on Windows environment

Problem:  tests: tests may fail on Windows environment
Solution: use shellcmdflag=/D to skip executing autorun from
          the registry (Milly)

closes: #15900

Signed-off-by: Milly <milly.ca@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Milly 2024-10-20 11:06:00 +02:00 committed by Christian Brabandt
parent 539349cb32
commit 4f5681dbdf
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
11 changed files with 21 additions and 19 deletions

View File

@ -3,7 +3,7 @@
set shell=c:\COMMAND.COM shellquote= shellxquote= shellcmdflag=/c shellredir=> set shell=c:\COMMAND.COM shellquote= shellxquote= shellcmdflag=/c shellredir=>
" This is used only when the +eval feature is available. " This is used only when the +eval feature is available.
if executable("cmd.exe") if executable("cmd.exe")
set shell=cmd.exe set shell=cmd.exe shellcmdflag=/D\ /c
endif endif
source setup.vim source setup.vim

View File

@ -59,7 +59,7 @@ func RunCommand(cmd)
let job = job_start(a:cmd, {"stoponexit": "hup"}) let job = job_start(a:cmd, {"stoponexit": "hup"})
call job_setoptions(job, {"stoponexit": "kill"}) call job_setoptions(job, {"stoponexit": "kill"})
elseif has('win32') elseif has('win32')
exe 'silent !start cmd /c start "test_channel" ' . a:cmd exe 'silent !start cmd /D /c start "test_channel" ' . a:cmd
else else
exe 'silent !' . a:cmd . '&' exe 'silent !' . a:cmd . '&'
endif endif

View File

@ -174,7 +174,7 @@ endfunc
" number. " number.
func Run_shell_in_terminal(options) func Run_shell_in_terminal(options)
if has('win32') if has('win32')
let buf = term_start([&shell, '/k'], a:options) let buf = term_start([&shell, '/D', '/k'], a:options)
else else
let buf = term_start(&shell, a:options) let buf = term_start(&shell, a:options)
endif endif

View File

@ -89,7 +89,7 @@ if has('timers')
let g:triggered = 0 let g:triggered = 0
au CursorHoldI * let g:triggered += 1 au CursorHoldI * let g:triggered += 1
set updatetime=100 set updatetime=100
call job_start(has('win32') ? 'cmd /c echo:' : 'echo', call job_start(has('win32') ? 'cmd /D /c echo:' : 'echo',
\ {'exit_cb': {-> timer_start(200, 'ExitInsertMode')}}) \ {'exit_cb': {-> timer_start(200, 'ExitInsertMode')}})
call feedkeys('a', 'x!') call feedkeys('a', 'x!')
call assert_equal(1, g:triggered) call assert_equal(1, g:triggered)

View File

@ -1429,7 +1429,7 @@ func Test_exit_cb_wipes_buf()
new new
let g:wipe_buf = bufnr('') let g:wipe_buf = bufnr('')
let job = job_start(has('win32') ? 'cmd /c echo:' : ['true'], let job = job_start(has('win32') ? 'cmd /D /c echo:' : ['true'],
\ {'exit_cb': 'ExitCbWipe'}) \ {'exit_cb': 'ExitCbWipe'})
let timer = timer_start(300, {-> feedkeys("\<Esc>", 'nt')}, {'repeat': 5}) let timer = timer_start(300, {-> feedkeys("\<Esc>", 'nt')}, {'repeat': 5})
call feedkeys(repeat('g', 1000) . 'o', 'ntx!') call feedkeys(repeat('g', 1000) . 'o', 'ntx!')
@ -1770,7 +1770,7 @@ func Test_job_start_fails()
call assert_fails("call job_start('ls', call assert_fails("call job_start('ls',
\ {'err_io' : 'buffer', 'err_buf' : -1})", 'E475:') \ {'err_io' : 'buffer', 'err_buf' : -1})", 'E475:')
let cmd = has('win32') ? "cmd /c dir" : "ls" let cmd = has('win32') ? "cmd /D /c dir" : "ls"
set nomodifiable set nomodifiable
call assert_fails("call job_start(cmd, call assert_fails("call job_start(cmd,
@ -2308,7 +2308,7 @@ endfunc
func Test_issue_5150() func Test_issue_5150()
if has('win32') if has('win32')
let cmd = 'cmd /c pause' let cmd = 'cmd /D /c pause'
else else
let cmd = 'grep foo' let cmd = 'grep foo'
endif endif
@ -2438,7 +2438,7 @@ func Test_cb_with_input()
let g:wait_exit_cb = 1 let g:wait_exit_cb = 1
if has('win32') if has('win32')
let cmd = 'cmd /c echo "Vim''s test"' let cmd = 'cmd /D /c echo "Vim''s test"'
else else
let cmd = 'echo "Vim''s test"' let cmd = 'echo "Vim''s test"'
endif endif

View File

@ -3416,7 +3416,7 @@ func Test_range()
call assert_fails('call term_start(range(3, 4))', 'E474:') call assert_fails('call term_start(range(3, 4))', 'E474:')
let g:terminal_ansi_colors = range(16) let g:terminal_ansi_colors = range(16)
if has('win32') if has('win32')
let cmd = "cmd /c dir" let cmd = "cmd /D /c dir"
else else
let cmd = "ls" let cmd = "ls"
endif endif

View File

@ -420,7 +420,7 @@ func s:get_unused_pid(base)
if has('job') if has('job')
" Execute 'echo' as a temporary job, and return its pid as an unused pid. " Execute 'echo' as a temporary job, and return its pid as an unused pid.
if has('win32') if has('win32')
let cmd = 'cmd /c echo' let cmd = 'cmd /D /c echo'
else else
let cmd = 'echo' let cmd = 'echo'
endif endif

View File

@ -320,10 +320,10 @@ endfunc
func Get_cat_123_cmd() func Get_cat_123_cmd()
if has('win32') if has('win32')
if !has('conpty') if !has('conpty')
return 'cmd /c "cls && color 2 && echo 123"' return 'cmd /D /c "cls && color 2 && echo 123"'
else else
" When clearing twice, extra sequence is not output. " When clearing twice, extra sequence is not output.
return 'cmd /c "cls && cls && color 2 && echo 123"' return 'cmd /D /c "cls && cls && color 2 && echo 123"'
endif endif
else else
call writefile(["\<Esc>[32m123"], 'Xtext') call writefile(["\<Esc>[32m123"], 'Xtext')
@ -410,7 +410,7 @@ func Test_terminal_scrape_multibyte()
if has('win32') if has('win32')
" Run cmd with UTF-8 codepage to make the type command print the expected " Run cmd with UTF-8 codepage to make the type command print the expected
" multibyte characters. " multibyte characters.
let buf = term_start("cmd /K chcp 65001") let buf = term_start("cmd /D /K chcp 65001")
call term_sendkeys(buf, "type Xtext\<CR>") call term_sendkeys(buf, "type Xtext\<CR>")
eval buf->term_sendkeys("exit\<CR>") eval buf->term_sendkeys("exit\<CR>")
let line = 4 let line = 4
@ -457,7 +457,7 @@ endfunc
func Test_terminal_scroll() func Test_terminal_scroll()
call writefile(range(1, 200), 'Xtext', 'D') call writefile(range(1, 200), 'Xtext', 'D')
if has('win32') if has('win32')
let cmd = 'cmd /c "type Xtext"' let cmd = 'cmd /D /c "type Xtext"'
else else
let cmd = "cat Xtext" let cmd = "cat Xtext"
endif endif
@ -765,7 +765,7 @@ endfunc
func Test_terminal_cwd() func Test_terminal_cwd()
if has('win32') if has('win32')
let cmd = 'cmd /c cd' let cmd = 'cmd /D /c cd'
else else
CheckExecutable pwd CheckExecutable pwd
let cmd = 'pwd' let cmd = 'pwd'
@ -1111,7 +1111,7 @@ func Test_terminal_composing_unicode()
set encoding=utf-8 set encoding=utf-8
if has('win32') if has('win32')
let cmd = "cmd /K chcp 65001" let cmd = "cmd /D /K chcp 65001"
let lnum = [3, 6, 9] let lnum = [3, 6, 9]
else else
let cmd = &shell let cmd = &shell

View File

@ -450,7 +450,7 @@ func Test_terminal_does_not_truncate_last_newlines()
for c in contents for c in contents
call writefile(c, 'Xdntfile', 'D') call writefile(c, 'Xdntfile', 'D')
if has('win32') if has('win32')
term cmd /c type Xdntfile term cmd /D /c type Xdntfile
else else
term cat Xdntfile term cat Xdntfile
endif endif
@ -465,7 +465,7 @@ endfunc
func GetDummyCmd() func GetDummyCmd()
if has('win32') if has('win32')
return 'cmd /c ""' return 'cmd /D /c ""'
else else
CheckExecutable false CheckExecutable false
return 'false' return 'false'

View File

@ -105,7 +105,7 @@ func Test_WindowsHome()
RestoreEnv RestoreEnv
let $HOME = save_home let $HOME = save_home
let env = '' let env = ''
let job = job_start('cmd /c set', {'out_cb': {ch,x->[env,execute('let env=x')]}}) let job = job_start('cmd /D /c set', {'out_cb': {ch,x->[env,execute('let env=x')]}})
sleep 1 sleep 1
let env = filter(split(env, "\n"), 'v:val=="HOME"') let env = filter(split(env, "\n"), 'v:val=="HOME"')
let home = len(env) == 0 ? "" : env[0] let home = len(env) == 0 ? "" : env[0]

View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
794,
/**/ /**/
793, 793,
/**/ /**/