From bc8fde1c0003b7e753dd60bf4909ddc7d6efa4be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= Date: Sat, 20 Aug 2011 01:58:56 +0200 Subject: [PATCH] cmd/tests: Fix bug where an output line was marked as matching when the expected line only differs by a terminal @space@. --- programs/cmd/tests/batch.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 3f8826fb686..17649d42cb7 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -168,9 +168,13 @@ static const char *compare_line(const char *out_line, const char *out_end, const }else if(exp_ptr+sizeof(space_cmd) <= exp_end && !memcmp(exp_ptr, space_cmd, sizeof(space_cmd))) { exp_ptr += sizeof(space_cmd); - if(out_ptr < out_end && *out_ptr == ' ') + if(out_ptr < out_end && *out_ptr == ' ') { out_ptr++; - continue; + continue; + } else { + err = out_end; + } + }else if(exp_ptr+sizeof(or_broken_cmd) <= exp_end && !memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) { if(out_ptr == out_end)