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 | 2b0d370788f9fccd7902f157497f2544f4ccc932 (patch) | |
| tree | 973e262306b60cbc1167c0c457b9772d4801e37d | |
| parent | 0bef3a21cc749550e47dfeaadb9843e91567e841 (diff) | |
| parent | 9697c2da4680267038d407093cbcbc4c68059904 (diff) | |
| download | tor-2b0d370788f9fccd7902f157497f2544f4ccc932.tar.gz tor-2b0d370788f9fccd7902f157497f2544f4ccc932.zip | |
Merge branch 'maint-0.3.2' into release-0.3.2
| -rw-r--r-- | changes/bug27658 | 6 | ||||
| -rw-r--r-- | src/ext/tinytest.c | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/changes/bug27658 b/changes/bug27658 new file mode 100644 index 0000000000..8cc0aa4714 --- /dev/null +++ b/changes/bug27658 @@ -0,0 +1,6 @@ + o Minor bugfixes (testing): + - If a unit test running in a subprocess exits abnormally or with a + nonzero status code, treat the test as having failed, even if + the test reported success. Without this fix, memory leaks don't cause + cause the tests to fail, even with LeakSanitizer. Fixes bug 27658; + bugfix on 0.2.2.4-alpha. 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 |