X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ffailtest%2Ffailtest.c;h=7a6f5220e60cd5ed7d1035922b267751c999a84e;hp=3f64bc91b512e35cb05a812979118ee06b9b1280;hb=b0a59bdcb3356eec66015bcdffd9a3fbaef0489a;hpb=b7dedf4344c7e573c048a36e7b456f2a4bdbebb7

diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c
index 3f64bc91..7a6f5220 100644
--- a/ccan/failtest/failtest.c
+++ b/ccan/failtest/failtest.c
@@ -84,8 +84,9 @@ static struct failtest_call *add_history_(enum failtest_call_type type,
 #define add_history(type, file, line, elem) \
 	add_history_((type), (file), (line), (elem), sizeof(*(elem)))
 
+/* We do a fake call inside a sizeof(), to check types. */
 #define set_cleanup(call, clean, type)			\
-	(call)->cleanup = (void *)((void)sizeof(clean((type *)NULL)), (clean))
+	(call)->cleanup = (void *)((void)sizeof(clean((type *)NULL),1), (clean))
 
 static bool read_write_info(int fd)
 {
@@ -330,8 +331,9 @@ static NORETURN void failtest_cleanup(bool forced_cleanup, int status)
 		if (!history[i].cleanup)
 			continue;
 		if (!forced_cleanup) {
-			printf("Leak at %s:%u\n",
-			       history[i].file, history[i].line);
+			printf("Leak at %s:%u: --failpath=%s\n",
+			       history[i].file, history[i].line,
+			       failpath_string());
 			status = 1;
 		}
 		history[i].cleanup(&history[i].u);
@@ -481,8 +483,13 @@ static bool should_fail(struct failtest_call *call)
 		else
 			ret = poll(pfd, 2, failtest_timeout_ms);
 
-		if (ret <= 0)
+		if (ret == 0)
 			hand_down(SIGUSR1);
+		if (ret < 0) {
+			if (errno == EINTR)
+				continue;
+			err(1, "Poll returned %i", ret);
+		}
 
 		if (pfd[0].revents & POLLIN) {
 			ssize_t len;