diff options
| -rw-r--r-- | source4/torture/basic/base.c | 6 | ||||
| -rw-r--r-- | source4/torture/raw/tconrate.c | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index 995357302b..0e168ed95b 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -1340,7 +1340,7 @@ static bool run_iometer(struct torture_context *tctx, for (i=0; i<num_reads; i++) { ssize_t res; if (ops++ > torture_numops) { - return true; + break; } res = smbcli_read(cli->tree, fnum, buf, random() % filesize, sizeof(buf)); @@ -1351,7 +1351,7 @@ static bool run_iometer(struct torture_context *tctx, for (i=0; i<num_writes; i++) { ssize_t res; if (ops++ > torture_numops) { - return true; + break; } res = smbcli_write(cli->tree, fnum, 0, buf, random() % filesize, sizeof(buf)); @@ -1360,6 +1360,8 @@ static bool run_iometer(struct torture_context *tctx, smbcli_errstr(cli->tree))); } } + + return true; } /** diff --git a/source4/torture/raw/tconrate.c b/source4/torture/raw/tconrate.c index b7ec15698d..329cdd4383 100644 --- a/source4/torture/raw/tconrate.c +++ b/source4/torture/raw/tconrate.c @@ -123,18 +123,23 @@ done: static bool children_remain(void) { + bool res; + /* Reap as many children as possible. */ for (;;) { pid_t ret = waitpid(-1, NULL, WNOHANG); if (ret == 0) { /* no children ready */ - return true; + res = true; + break; } if (ret == -1) { /* no children left. maybe */ - return errno == ECHILD ? false : true; + res = errno != ECHILD; + break; } } + return res; } static double rate_convert_secs(unsigned count, |