X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ffailtest%2Ftest%2Frun-open.c;h=8b31ff71f35e73349e7ac1e9a060ef7014721c53;hb=f7ead5da96bfb5ce3ebffe11256bbcb5f4b4f750;hp=dda7ddb643b75b20a1b27036d8e04c4cbdefc590;hpb=f070b47bc6458e7a374e48c15336f329529e5fdd;p=ccan

diff --git a/ccan/failtest/test/run-open.c b/ccan/failtest/test/run-open.c
index dda7ddb6..8b31ff71 100644
--- a/ccan/failtest/test/run-open.c
+++ b/ccan/failtest/test/run-open.c
@@ -1,11 +1,11 @@
+/* Include the C files directly. */
+#include <ccan/failtest/failtest.c>
 #include <stdlib.h>
 #include <setjmp.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <assert.h>
 #include <ccan/tap/tap.h>
-/* Include the C files directly. */
-#include <ccan/failtest/failtest.c>
 
 int main(void)
 {
@@ -14,19 +14,22 @@ int main(void)
 	struct stat st;
 
 	plan_tests(12);
+	failtest_init(0, NULL);
 
-	pipe(pfd);
+	if (pipe(pfd))
+		abort();
 	fd = failtest_open("run-open-scratchpad", "run-open.c", 1,
 			   O_RDWR|O_CREAT, 0600);
 	if (fd == -1) {
 		/* We are the child: write error code for parent to check. */
 		err = errno;
-		write(pfd[1], &err, sizeof(err));
+		if (write(pfd[1], &err, sizeof(err)) != sizeof(err))
+			abort();
 		failtest_exit(0);
 	}
 	/* Check it is read-write. */
 	ok1(write(fd, buf, strlen(buf)) == strlen(buf));
-	lseek(fd, SEEK_SET, 0);
+	lseek(fd, 0, SEEK_SET);
 	ok1(read(fd, buf, strlen("Hello world!")) == strlen("Hello world!"));
 	ok1(strcmp(buf, "Hello world!") == 0);
 
@@ -41,17 +44,19 @@ int main(void)
 	ok1(err == EACCES);
 
 	/* Clean up. */
-	close(fd);
+	failtest_close(fd, "run-open.c", 1);
 	close(pfd[0]);
 	close(pfd[1]);
 
 	/* Two-arg open. */
-	pipe(pfd);
+	if (pipe(pfd) != 0)
+		abort();
 	fd = failtest_open("run-open-scratchpad", "run-open.c", 1, O_RDONLY);
 	if (fd == -1) {
 		/* We are the child: write error code for parent to check. */
 		err = errno;
-		write(pfd[1], &err, sizeof(err));
+		if (write(pfd[1], &err, sizeof(err)) != sizeof(err))
+			abort();
 		failtest_exit(0);
 	}
 	/* Check it is read-only. */
@@ -59,7 +64,7 @@ int main(void)
 	ok1(read(fd, buf, strlen("Hello world!")) == strlen("Hello world!"));
 	ok1(strcmp(buf, "Hello world!") == 0);
 	/* Clean up. */
-	close(fd);
+	failtest_close(fd, "run-open.c", 1);
 	close(pfd[0]);
 	close(pfd[1]);