From: Alfred Agrell floating@muncher.se
--- programs/cmd/tests/test_builtins.cmd | 23 ++++++++++++++++++++--- programs/cmd/tests/test_builtins.cmd.exp | 7 +++++++ 2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 58d78194380..7d901d981e6 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,25 @@ echo Skipped as not enough permissions echo Skipped as not enough permissions echo --- resetting association echo original value - -:ContinueCall +:ExitFtype + +echo ------------ Testing mode ------------ +rem MODE only works if given an actual console, so it needs a START wrapper, which needs various escaping +echo @mode CON ^| findstr "666" >> mode.bat +echo @echo %%errorlevel%% ^>^> mode.txt >> mode.bat +echo @mode CON lines=666 >> mode.bat +echo @echo %%errorlevel%% ^>^> mode.txt >> mode.bat +echo @mode CON ^| findstr ^"666^" >> mode.bat +echo @echo %%errorlevel%% ^>^> mode.txt >> mode.bat +echo @mode CON lines=false >> mode.bat +echo @echo %%errorlevel%% ^>^> mode.txt >> mode.bat +echo @mode CON lines= >> mode.bat +echo @echo %%errorlevel%% ^>^> mode.txt >> mode.bat +echo @mode NOTADEVICE >> mode.bat +echo @echo %%errorlevel%% ^>^> mode.txt >> mode.bat +start /wait cmd /c mode.bat +type mode.txt +del mode.bat mode.txt 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..c69a2457ae4 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1861,6 +1861,13 @@ footype=cmd.exe /c "echo '%*'" foobar@or_broken@Skipped as not enough permissions --- resetting association original value@or_broken@buggyXP@or_broken@!WINE_FOO! +------------ Testing mode ------------ +1 +0 +0 +-1 +-1 +-1 ------------ Testing CALL ------------ --- external script foo@space@