Module: wine Branch: master Commit: a9513cf44610a4653a30517cc063049bf372f9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9513cf44610a4653a30517cc0...
Author: Francois Gouget fgouget@free.fr Date: Wed Nov 18 14:56:43 2015 +0100
cmd/tests: Fix handling of synchronization line mismatches.
If the synchronization line does not match assume that we skipped some tests.
Signed-off-by: Francois Gouget fgouget@free.fr Signed-off-by: Alexandre Julliard julliard@winehq.org
---
programs/cmd/tests/batch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index c1847d6..9b54089 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -320,7 +320,8 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da /* If we rewind to the beginning of the line, don't increment line number */ line--; } - else if (!is_exp_resync || !err) + else if (!is_exp_resync || !err || + (is_exp_resync && is_out_resync && err)) { exp_ptr = exp_nl+1; if(exp_nl+1 < exp_data+exp_size && exp_nl[0] == '\r' && exp_nl[1] == '\n')