From a9513cf44610a4653a30517cc063049bf372f9c4 Mon Sep 17 00:00:00 2001 From: Francois Gouget <fgouget@free.fr> Date: Wed, 18 Nov 2015 14:56:43 +0100 Subject: [PATCH] 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 c1847d673d2..9b540891472 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') -- GitLab