X-Git-Url: https://git.ozlabs.org/?p=ccan-lca-2011.git;a=blobdiff_plain;f=ccan%2Foserver%2Ftest%2Frun.c;h=b8e9dc3042c67312aade84acc9a4a95abaabf1a3;hp=ee3959ec10ce888b5281bad6e61b6f326240d9a4;hb=a2a89814bd9b71612778cbb1fed3ae0d8cadc6b5;hpb=b0bdcd94d922a2bdbe6288b1f68efe15ed70d563

diff --git a/ccan/oserver/test/run.c b/ccan/oserver/test/run.c
index ee3959e..b8e9dc3 100644
--- 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());
 }