Browse Source

failtest: be clearer when child times out.

ie. SIGUSR1 means it timed out.
Rusty Russell 15 years ago
parent
commit
5069685c5e
1 changed files with 7 additions and 3 deletions
  1. 7 3
      ccan/failtest/failtest.c

+ 7 - 3
ccan/failtest/failtest.c

@@ -455,9 +455,13 @@ static bool should_fail(struct failtest_call *call)
 	close(output[0]);
 	close(control[0]);
 	waitpid(child, &status, 0);
-	if (!WIFEXITED(status))
-		child_fail(out, outlen, "Killed by signal %u: ",
-			   WTERMSIG(status));
+	if (!WIFEXITED(status)) {
+		if (WTERMSIG(status) == SIGUSR1)
+			child_fail(out, outlen, "Timed out");
+		else
+			child_fail(out, outlen, "Killed by signal %u: ",
+				   WTERMSIG(status));
+	}
 	/* Child printed failure already, just pass up exit code. */
 	if (type == FAILURE) {
 		fprintf(stderr, "%.*s", (int)outlen, out);