lca2011: use failtest

This gives us one more line of coverate for very little cost.

diff --git a/ccan/oserver/_info b/ccan/oserver/_info
index a9c74fc961c698afcd6742e0db6371570ba44138..85ed0bf7881684c93ee5178d6af0a2366303cb04 100644 (file)
--- a/ccan/oserver/_info
+++ b/ccan/oserver/_info
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
                printf("ccan/str\n");
                printf("ccan/foreach\n");
                printf("ccan/noerr\n");
+               printf("ccan/failtest\n");
                return 0;
        }
 

diff --git a/ccan/oserver/test/run.c b/ccan/oserver/test/run.c
index ee3959ec10ce888b5281bad6e61b6f326240d9a4..b8e9dc3042c67312aade84acc9a4a95abaabf1a3 100644 (file)
--- a/ccan/oserver/test/run.c
+++ b/ccan/oserver/test/run.c
@@ -1,15 +1,22 @@
-#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;
        char buf[200];
@@ -17,6 +24,8 @@ int main(void)
 
        /* This is how many tests you plan to run */
        plan_tests(3 * 6);
+       failtest_init(argc, argv);
+       tap_fail_callback = exit_test;
 
        foreach_ptr(input,
                    "This is a test\n",
@@ -41,5 +50,5 @@ int main(void)
        }
 
        /* This exits depending on whether all tests passed */
-       return exit_status();
+       failtest_exit(exit_status());
 }