From ead3ef21bb740358d24b0315808a0abacd87d10a Mon Sep 17 00:00:00 2001 From: Håvard Pettersen Date: Sat, 5 Mar 2022 18:22:21 +0000 Subject: handle eof vs actual empty lines correctly --- vespamalloc/src/tests/doubledelete/expectsignal.cpp | 2 +- vespamalloc/src/tests/overwrite/expectsignal.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'vespamalloc/src') diff --git a/vespamalloc/src/tests/doubledelete/expectsignal.cpp b/vespamalloc/src/tests/doubledelete/expectsignal.cpp index df6398dcd20..66688a71923 100644 --- a/vespamalloc/src/tests/doubledelete/expectsignal.cpp +++ b/vespamalloc/src/tests/doubledelete/expectsignal.cpp @@ -23,7 +23,7 @@ int Test::Main() fprintf(stderr, "argc=%d : Running '%s' expecting signal %d\n", _argc, _argv[2], retval); Process cmd(_argv[2]); - for (vespalib::string line = cmd.read_line(); !line.empty(); line = cmd.read_line()) { + for (vespalib::string line = cmd.read_line(); !(line.empty() && cmd.eof()); line = cmd.read_line()) { fprintf(stdout, "%s\n", line.c_str()); } int exitCode = cmd.join(); diff --git a/vespamalloc/src/tests/overwrite/expectsignal.cpp b/vespamalloc/src/tests/overwrite/expectsignal.cpp index df6398dcd20..66688a71923 100644 --- a/vespamalloc/src/tests/overwrite/expectsignal.cpp +++ b/vespamalloc/src/tests/overwrite/expectsignal.cpp @@ -23,7 +23,7 @@ int Test::Main() fprintf(stderr, "argc=%d : Running '%s' expecting signal %d\n", _argc, _argv[2], retval); Process cmd(_argv[2]); - for (vespalib::string line = cmd.read_line(); !line.empty(); line = cmd.read_line()) { + for (vespalib::string line = cmd.read_line(); !(line.empty() && cmd.eof()); line = cmd.read_line()) { fprintf(stdout, "%s\n", line.c_str()); } int exitCode = cmd.join(); -- cgit v1.2.3