From: Eric Pouech epouech@codeweavers.com
Signed-off-by: Eric Pouech epouech@codeweavers.com --- programs/cmd/tests/test_builtins.bat | 5 ++++- programs/cmd/tests/test_builtins.bat.exp | 4 ++-- programs/cmd/tests/test_builtins.cmd | 5 ++++- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/programs/cmd/tests/test_builtins.bat b/programs/cmd/tests/test_builtins.bat index 05abc8de655..dc624111213 100644 --- a/programs/cmd/tests/test_builtins.bat +++ b/programs/cmd/tests/test_builtins.bat @@ -332,9 +332,12 @@ call :setError 666 & ((echo A | choice /C:BA) >NUL &&echo SUCCESS !errorlevel!|| call :setError 666 & (choice /C:BA <NUL >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) rem syntax errors in command return INVALID_FUNCTION, need to find a test for returning 255 echo --- success/failure for MORE command +echo a> filea call :setError 666 & (more NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) -call :setError 666 & (more I\dont\exist.txt > NUL 2>&1 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & (echo foo | more &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem native 'MORE file' outputs to CONOUT$, not stdout! +call :setError 666 & (more filea I\dont\exist.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +erase filea echo --- success/failure for PAUSE command call :setError 666 & (pause < NUL > NUL 2>&1 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) rem TODO: pause is harder to test when fd 1 is a console handle as we don't control output diff --git a/programs/cmd/tests/test_builtins.bat.exp b/programs/cmd/tests/test_builtins.bat.exp index 608f3d11e15..d3f23abde77 100644 --- a/programs/cmd/tests/test_builtins.bat.exp +++ b/programs/cmd/tests/test_builtins.bat.exp @@ -225,10 +225,10 @@ FAILURE 2 FAILURE 1 --- success/failure for MORE command SUCCESS 0 -SUCCESS 0 foo@space@
SUCCESS 0 ---- success/failure for PAUSE command +@todo_wine@SUCCESS 0 +@todo_wine@--- success/failure for PAUSE command FAILURE 1 --- diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7ac989593df..19dc3c788bb 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -857,9 +857,12 @@ call :setError 666 & ((echo A | choice /C:BA) >NUL &&echo SUCCESS !errorlevel!|| call :setError 666 & (choice /C:BA <NUL >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) rem syntax errors in command return INVALID_FUNCTION, need to find a test for returning 255 echo --- success/failure for MORE command +echo a>filea call :setError 666 & (more NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) -call :setError 666 & (more I\dont\exist.txt > NUL 2>&1 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) call :setError 666 & (echo foo | more &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem native 'MORE file' outputs to CONOUT$, not stdout! +call :setError 666 & (more filea I\dont\exist.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +erase filea echo --- success/failure for PAUSE command call :setError 666 & (pause < NUL > NUL 2>&1 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) rem TODO: pause is harder to test when fd 1 is a console handle as we don't control output diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index dde889755aa..644ca910c8c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -689,11 +689,11 @@ FAILURE 2 FAILURE 1 --- success/failure for MORE command SUCCESS 0 -SUCCESS 0 foo@space@
SUCCESS 0 ---- success/failure for PAUSE command +@todo_wine@SUCCESS 0 +@todo_wine@--- success/failure for PAUSE command FAILURE 1 --- --------- success/failure when invoking cmd /c --------------