On Fri, Dec 2, 2011 at 10:07, Francois Gouget fgouget@free.fr wrote:
I meant to resend this one as [2/2] in my previous series but forgot. With the resynchronization points we can now handle the fixed output correctly in the tests this time.
programs/cmd/builtins.c | 20 ++++++++++---------- programs/cmd/tests/test_builtins.cmd | 1 - programs/cmd/tests/test_builtins.cmd.exp | 7 +++---- 3 files changed, 13 insertions(+), 15 deletions(-)
Hi François.
Would you mind updating the http://wiki.winehq.org/CmdConformanceTests page with your synchronization stuff? I'm not quite sure what/how it does exactly.
There is now a discrepancy between wine output, and testrunner output, e.g. echo ------ eol option for /f "eol=@" %%i in (" ad") do echo %%i echo bar
gave
------ eol option Syntax error bar
but not gives
------ eol option bar
Shouldn't cmd output always give the same as test runner output (which is supposed to run cmd on the input file (test_builtins.cmd), albeit with some preprocessing)?
Frédéric
On Fri, 2 Dec 2011, Frédéric Delanoy wrote: [...]
Would you mind updating the http://wiki.winehq.org/CmdConformanceTests page with your synchronization stuff?
Done.
There is now a discrepancy between wine output, and testrunner output, e.g.
As far as I can tell the tests pass both in Wine an on Windows. What is test runner?
2011/12/2 Francois Gouget fgouget@free.fr:
On Fri, 2 Dec 2011, Frédéric Delanoy wrote: [...]
Would you mind updating the http://wiki.winehq.org/CmdConformanceTests page with your synchronization stuff?
Done.
There is now a discrepancy between wine output, and testrunner output, e.g.
As far as I can tell the tests pass both in Wine an on Windows. What is test runner?
The programs/cmd/tests/batch.c file that preprocesses the .cmd file and compares it to the associated .exp file; this is run when you do a "make test"
On Fri, 2 Dec 2011, Frédéric Delanoy wrote: [...]
As far as I can tell the tests pass both in Wine an on Windows. What is test runner?
The programs/cmd/tests/batch.c file that preprocesses the .cmd file and compares it to the associated .exp file; this is run when you do a "make test"
Sorry I don't understand what you're saying.
programs/cmd/tests/batch.c is being run as part of 'make test'. It produces a test.out file but does not modify that file in any way. It then compares test.out with test_builtins.cmd.exp taking into account various comparison directives.
[from previous post]
There is now a discrepancy between wine output, and testrunner output,
So what is the 'testrunner output' you are speaking of? 'test.out'? That's the unmodified cmd output as far as I know so there is no reason why it would be different from running cmd manually.
This patch fixes Wine's cmd implementation which was sending error messages to stdout instead of stderr like Windows does. As a result a number of @todo_wine@ directives can be removed from test_builtins.cmd.exp.
On Fri, 2 Dec 2011, Frédéric Delanoy wrote: [...]
There is now a discrepancy between wine output, and testrunner output, e.g. echo ------ eol option for /f "eol=@" %%i in (" ad") do echo %%i echo bar
gave
------ eol option Syntax error bar
but not gives
------ eol option bar
Shouldn't cmd output always give the same as test runner output (which is supposed to run cmd on the input file (test_builtins.cmd), albeit with some preprocessing)?
Are you just confused because batch.c sends stdout to test.out and sdterr to test.err while, when running 'wine cmd' everything ends out on the console?
2011/12/2 Francois Gouget fgouget@free.fr:
On Fri, 2 Dec 2011, Frédéric Delanoy wrote: [...]
There is now a discrepancy between wine output, and testrunner output, e.g. echo ------ eol option for /f "eol=@" %%i in (" ad") do echo %%i echo bar
gave
------ eol option Syntax error bar
but not gives
------ eol option bar
Shouldn't cmd output always give the same as test runner output (which is supposed to run cmd on the input file (test_builtins.cmd), albeit with some preprocessing)?
Are you just confused because batch.c sends stdout to test.out and sdterr to test.err while, when running 'wine cmd' everything ends out on the console?
OK. Got it. Sorry for the noise. I'll check your updated doc.
Frédéric