diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-13 11:46:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-13 11:46:04 -0400 |
| commit | 9697c2da4680267038d407093cbcbc4c68059904 (patch) | |
| tree | bb273660c438ea59521073a5faa4560b02bf532e /src/ext | |
| parent | 5a8827a4c98a354c775060f6c85c05a97c56e9b4 (diff) | |
| parent | c02f2d9eb45786c552dcc33c102e9964d95f66c1 (diff) | |
| download | tor-9697c2da4680267038d407093cbcbc4c68059904.tar.gz tor-9697c2da4680267038d407093cbcbc4c68059904.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.2
Diffstat (limited to 'src/ext')
| -rw-r--r-- | src/ext/tinytest.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/ext/tinytest.c b/src/ext/tinytest.c index 3fb1b39c71..a51cd6011a 100644 --- a/src/ext/tinytest.c +++ b/src/ext/tinytest.c @@ -207,12 +207,20 @@ testcase_run_forked_(const struct testgroup_t *group, r = (int)read(outcome_pipe[0], b, 1); if (r == 0) { printf("[Lost connection!] "); - return 0; + return FAIL; } else if (r != 1) { perror("read outcome from pipe"); } - waitpid(pid, &status, 0); + r = waitpid(pid, &status, 0); close(outcome_pipe[0]); + if (r == -1) { + perror("waitpid"); + return FAIL; + } + if (! WIFEXITED(status) || WEXITSTATUS(status) != 0) { + printf("[did not exit cleanly.]"); + return FAIL; + } return b[0]=='Y' ? OK : (b[0]=='S' ? SKIP : FAIL); } #endif |