lca2011: use failtest

[ccan-lca-2011.git] / ccan / oserver / test / run.c

diff --git a/ccan/oserver/test/run.c b/ccan/oserver/test/run.c
index 3a93be8974e9976d51900b902dabe27d325126c6..b8e9dc3042c67312aade84acc9a4a95abaabf1a3 100644 (file)
--- a/ccan/oserver/test/run.c
+++ b/ccan/oserver/test/run.c
@@ -1,40 +1,54 @@
-#include <ccan/oserver/oserver.h>
+#include <ccan/failtest/failtest_override.h>
 #include <ccan/oserver/oserver.c>
+#include <ccan/oserver/oserver.h>
 #include <ccan/str/str.h>
+#include <ccan/foreach/foreach.h>
 #include <ccan/tap/tap.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <ccan/failtest/failtest.h>
 #include <fcntl.h>
 #include <string.h>
-#include <sys/wait.h>
+#include <ccan/failtest/failtest_undo.h>
+
+static void exit_test(void)
+{
+       failtest_exit(exit_status());
+}
 
-int main(void)
+int main(int argc, char *argv[])
 {
        int fd;
-       int status;
        char buf[200];
+       const char *input;
 
        /* This is how many tests you plan to run */
-       plan_tests(3);
-
-       fd = open("run-fd", O_RDWR|O_CREAT|O_TRUNC, 0600);
-       write(fd, "This is a test\n", sizeof("This is a test\n"));
-       lseek(fd, 0, SEEK_SET);
+       plan_tests(3 * 6);
+       failtest_init(argc, argv);
+       tap_fail_callback = exit_test;
 
-       if (fork() == 0)
-               oserver_serve(fd);
+       foreach_ptr(input,
+                   "This is a test\n",
+                   "This is a test\r",
+                   "This is a test\r\n",
+                   "This is a test\nWith extra",
+                   "This is a test\rWith extra",
+                   "This is a test\r\nWith extra") {
+               fd = open("run-fd", O_RDWR|O_CREAT|O_TRUNC, 0600);
 
-       wait(&status);
+               write(fd, input, strlen(input));
+               lseek(fd, 0, SEEK_SET);
 
-       ok1(WIFEXITED(status));
-       ok1(WEXITSTATUS(status) == 0);
+               ok1(oserver_serve(fd));
 
-       lseek(fd, 0, SEEK_SET);
-       buf[read(fd, buf, sizeof(buf)-1)] = '\0';
+               lseek(fd, 0, SEEK_SET);
+               buf[read(fd, buf, sizeof(buf)-1)] = '\0';
 
-       ok1(streq(buf, "This is a test\n"
-                 "Louder, like this: 'THIS IS A TEST'\r\n"));
+               ok1(strncmp(buf, input, strlen("This is a test")) == 0);
+               ok1(streq(buf + strlen("This is a test") + 1,
+                         "Louder, like this: 'THIS IS A TEST'\r\n"));
+       }
 
        /* This exits depending on whether all tests passed */
-       return exit_status();
+       failtest_exit(exit_status());
 }