* 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;
done = write(fd, data, size);
if (done <= 0)
_exit(1);
- data += done;
+ data = (const char *)data + done;
size -= done;
}
}
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");
ok(0, "msg2");
expect(p[0], "not ok 2 - msg2\n"
- "# Failed test (*tap/test/run.c:main() at line 77)\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 84)\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 91)\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"
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 100)\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();
write_all(stdoutfd, "ok 1 - All passed\n",
strlen("ok 1 - All passed\n"));
- _exit(0);
+ exit(0);
}