X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftap%2Ftest%2Frun.c;h=fb039a895c12181c43664d66e83b86b532824651;hp=5af7c2e9a80938f381f20d167cdd6a42d4a591ba;hb=926996e88c32445c874ff9c4f47f159db6b45995;hpb=be74c29bc91273ce585139b2b1f7305512ae941b

diff --git a/ccan/tap/test/run.c b/ccan/tap/test/run.c
index 5af7c2e9..fb039a89 100644
--- a/ccan/tap/test/run.c
+++ b/ccan/tap/test/run.c
@@ -2,17 +2,17 @@
  * any output, and change stdout and stderr to use that.
  *
  * Since we don't use libtap for output, this looks like one big test. */
-#include "tap/tap.h"
+#include <ccan/tap/tap.h>
+#include <ccan/tap/tap.c>
 #include <stdio.h>
-#include <unistd.h>
-#include <stdarg.h>
+#include <limits.h>
 #include <err.h>
 #include <string.h>
-#include <stdlib.h>
-#include <limits.h>
 #include <stdbool.h>
 #include <fnmatch.h>
 
+
+
 /* We dup stderr to here. */
 static int stderrfd;
 
@@ -25,7 +25,7 @@ static void write_all(int fd, const void *data, size_t size)
 		done = write(fd, data, size);
 		if (done <= 0)
 			_exit(1);
-		data += done;
+		data = (const char *)data + done;
 		size -= done;
 	}
 }
@@ -66,8 +66,8 @@ int main(int argc, char *argv[])
 	int p[2];
 	int stdoutfd;
 
+	setbuf(stdout, 0);
 	printf("1..1\n");
-	fflush(stdout);
 	stderrfd = dup(STDERR_FILENO);
 	if (stderrfd < 0)
 		err(1, "dup of stderr failed");
@@ -90,21 +90,21 @@ int main(int argc, char *argv[])
 
 	ok(0, "msg2");
 	expect(p[0], "not ok 2 - msg2\n"
-	       "#     Failed test (*tap/test/run.c:main() at line 91)\n");
+	       "#     Failed test (*test/run.c:main() at line 91)\n");
 
 	ok1(true);
 	expect(p[0], "ok 3 - true\n");
 
 	ok1(false);
  	expect(p[0], "not ok 4 - false\n"
-	       "#     Failed test (*tap/test/run.c:main() at line 98)\n");
+	       "#     Failed test (*test/run.c:main() at line 98)\n");
 
 	pass("passed");
  	expect(p[0], "ok 5 - passed\n");
 
 	fail("failed");
  	expect(p[0], "not ok 6 - failed\n"
-	       "#     Failed test (*tap/test/run.c:main() at line 105)\n");
+	       "#     Failed test (*test/run.c:main() at line 105)\n");
 
 	skip(2, "skipping %s", "test");
  	expect(p[0], "ok 7 # skip skipping test\n"
@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
 	todo_start("todo");
 	ok1(false);
 	expect(p[0], "not ok 9 - false # TODO todo\n"
-	       "#     Failed (TODO) test (*tap/test/run.c:main() at line 114)\n");
+	       "#     Failed (TODO) test (*test/run.c:main() at line 114)\n");
 	ok1(true);
 	expect(p[0], "ok 10 - true # TODO todo\n");
 	todo_end();
@@ -129,5 +129,5 @@ int main(int argc, char *argv[])
 
 	write_all(stdoutfd, "ok 1 - All passed\n",
 		  strlen("ok 1 - All passed\n"));
-	_exit(0);
+	exit(0);
 }