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 dc6031b9de547e715a4e6f54c80389afcc62fc4c..b8e9dc3042c67312aade84acc9a4a95abaabf1a3 100644 (file)
--- a/ccan/oserver/test/run.c
+++ b/ccan/oserver/test/run.c
@@ -1,23 +1,31 @@
-#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>
 
-int main(void)
+static void exit_test(void)
+{
+       failtest_exit(exit_status());
+}
+
+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(4 * 6);
+       plan_tests(3 * 6);
+       failtest_init(argc, argv);
+       tap_fail_callback = exit_test;
 
        foreach_ptr(input,
                    "This is a test\n",
@@ -31,13 +39,7 @@ int main(void)
                write(fd, input, strlen(input));
                lseek(fd, 0, SEEK_SET);
 
-               if (fork() == 0)
-                       oserver_serve(fd);
-
-               wait(&status);
-
-               ok1(WIFEXITED(status));
-               ok1(WEXITSTATUS(status) == 0);
+               ok1(oserver_serve(fd));
 
                lseek(fd, 0, SEEK_SET);
                buf[read(fd, buf, sizeof(buf)-1)] = '\0';
@@ -48,5 +50,5 @@ int main(void)
        }
 
        /* This exits depending on whether all tests passed */
-       return exit_status();
+       failtest_exit(exit_status());
 }