From: Alfred Agrell <floating(a)muncher.se> --- programs/cmd/tests/test_builtins.cmd | 18 ++++++++++++++++-- programs/cmd/tests/test_builtins.cmd.exp | 13 +++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 58d78194380..905eabf105f 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -3174,7 +3174,7 @@ regedit /s regCleanup.reg set WINE_FOO= endlocal cd .. & rd /s/q foobar -goto ContinueCall +goto ExitFtype :SkipFType echo --- setting association echo --- @@ -3191,8 +3191,22 @@ echo Skipped as not enough permissions echo Skipped as not enough permissions echo --- resetting association echo original value +:ExitFtype + +echo ------------ Testing mode ------------ +call :setError 666 & (mode CON >nul &&echo SUCCESS||echo FAILURE) +echo %errorlevel% +call :setError 666 & (mode CON | findstr "666" >nul &&echo SUCCESS||echo FAILURE) +echo %errorlevel% +call :setError 666 & (mode CON lines=666 &&echo SUCCESS||echo FAILURE) +echo %errorlevel% +call :setError 666 & (mode CON | findstr "666" >nul &&echo SUCCESS||echo FAILURE) +echo %errorlevel% +call :setError 666 & (mode CON lines=false >nul &&echo SUCCESS||echo FAILURE) +echo %errorlevel% +call :setError 666 & (mode NOTADEVICE >nul &&echo SUCCESS||echo FAILURE) +echo %errorlevel% -:ContinueCall echo ------------ Testing CALL ------------ mkdir foobar & cd foobar echo --- external script diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index ff6f944cffb..20f2e4e40b1 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1861,6 +1861,19 @@ footype=cmd.exe /c "echo '%*'" foobar(a)or_broken@Skipped as not enough permissions --- resetting association original value(a)or_broken@buggyXP(a)or_broken@!WINE_FOO! +------------ Testing mode ------------ +SUCCESS +0 +FAILURE +1 +SUCCESS +0 +SUCCESS +0 +FAILURE +-1 +FAILURE +-1 ------------ Testing CALL ------------ --- external script foo(a)space@ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7491