tor

commit 3ddfd5ff25b1319dee3a013c8dac02ff9121971e
parent f8d5fb42a392a764da9f46102583ea2dff960939
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 13 Sep 2018 11:46:04 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

Diffstat:
A
changes/bug27658
 | 
6
++++++
M
src/ext/tinytest.c
 | 
12
++++++++++--

2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/changes/bug27658 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
@@ -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