+/* Include the C files directly. */
+#include <ccan/failtest/failtest.c>
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
#include <ccan/tap/tap.h>
-#define printf saved_printf
-static int saved_printf(const char *fmt, ...);
-
-#define fprintf saved_fprintf
-static int saved_fprintf(FILE *ignored, const char *fmt, ...);
-
-/* Include the C files directly. */
-#include <ccan/failtest/failtest.c>
-
-static char *output = NULL;
-
-static int saved_vprintf(const char *fmt, va_list ap)
-{
- int ret = vsnprintf(NULL, 0, fmt, ap);
- int len = 0;
-
- if (output)
- len = strlen(output);
-
- output = realloc(output, len + ret + 1);
- return vsprintf(output + len, fmt, ap);
-}
-
-static int saved_printf(const char *fmt, ...)
-{
- va_list ap;
- int ret;
-
- va_start(ap, fmt);
- ret = saved_vprintf(fmt, ap);
- va_end(ap);
- return ret;
-}
-
-static int saved_fprintf(FILE *ignored, const char *fmt, ...)
-{
- va_list ap;
- int ret;
-
- va_start(ap, fmt);
- ret = saved_vprintf(fmt, ap);
- va_end(ap);
- return ret;
-}
-
int main(void)
{
struct failtest_call *call;
struct pipe_call pipe_call;
struct read_call read_call;
struct write_call write_call;
+ struct mmap_call mmap_call;
char buf[20];
unsigned int i;
+ char *path;
/* This is how many tests you plan to run */
- plan_tests(47);
+ plan_tests(69);
calloc_call.ret = calloc(1, 2);
calloc_call.nmemb = 1;
calloc_call.size = 2;
- call = add_history(FAILTEST_CALLOC, "run-history.c", 1, &calloc_call);
+ call = add_history(FAILTEST_CALLOC, true,
+ "run-history.c", 1, &calloc_call);
+ /* Normally should_fail would set this. */
+ call->fail = false;
ok1(call->type == FAILTEST_CALLOC);
+ ok1(call->can_leak == true);
ok1(strcmp(call->file, "run-history.c") == 0);
ok1(call->line == 1);
ok1(call->u.calloc.ret == calloc_call.ret);
malloc_call.ret = malloc(2);
malloc_call.size = 2;
- call = add_history(FAILTEST_MALLOC, "run-history.c", 2, &malloc_call);
+ call = add_history(FAILTEST_MALLOC, true,
+ "run-history.c", 2, &malloc_call);
+ /* Normally should_fail would set this. */
+ call->fail = false;
ok1(call->type == FAILTEST_MALLOC);
+ ok1(call->can_leak == true);
ok1(strcmp(call->file, "run-history.c") == 0);
ok1(call->line == 2);
ok1(call->u.malloc.ret == malloc_call.ret);
realloc_call.ret = realloc(malloc_call.ret, 3);
realloc_call.ptr = malloc_call.ret;
realloc_call.size = 3;
- call = add_history(FAILTEST_REALLOC, "run-history.c",
- 3, &realloc_call);
+ call = add_history(FAILTEST_REALLOC, true, "run-history.c", 3,
+ &realloc_call);
+ /* Normally should_fail would set this. */
+ call->fail = false;
ok1(call->type == FAILTEST_REALLOC);
+ ok1(call->can_leak == true);
ok1(strcmp(call->file, "run-history.c") == 0);
ok1(call->line == 3);
ok1(call->u.realloc.ret == realloc_call.ret);
ok1(call->u.realloc.ptr == realloc_call.ptr);
ok1(call->u.realloc.size == realloc_call.size);
- open_call.ret = open("test/run_history.c", O_RDONLY);
- open_call.pathname = "test/run_history.c";
+ open_call.ret = open("test/run-history.c", O_RDONLY);
+ open_call.pathname = "test/run-history.c";
open_call.flags = O_RDONLY;
open_call.mode = 0;
- call = add_history(FAILTEST_OPEN, "run-history.c", 4, &open_call);
+ open_call.closed = false;
+ call = add_history(FAILTEST_OPEN, true, "run-history.c", 4, &open_call);
+ /* Normally should_fail would set this. */
+ call->fail = false;
ok1(call->type == FAILTEST_OPEN);
+ ok1(call->can_leak == true);
ok1(strcmp(call->file, "run-history.c") == 0);
ok1(call->line == 4);
ok1(call->u.open.ret == open_call.ret);
ok1(call->u.open.mode == open_call.mode);
pipe_call.ret = pipe(pipe_call.fds);
- call = add_history(FAILTEST_PIPE, "run-history.c", 5, &pipe_call);
+ call = add_history(FAILTEST_PIPE, true, "run-history.c", 5, &pipe_call);
+ /* Normally should_fail would set this. */
+ call->fail = false;
ok1(call->type == FAILTEST_PIPE);
ok1(strcmp(call->file, "run-history.c") == 0);
+ ok1(call->can_leak == true);
ok1(call->line == 5);
ok1(call->u.pipe.ret == pipe_call.ret);
ok1(call->u.pipe.fds[0] == pipe_call.fds[0]);
read_call.buf = buf;
read_call.fd = open_call.ret;
read_call.count = 20;
- call = add_history(FAILTEST_READ, "run-history.c", 6, &read_call);
+ call = add_history(FAILTEST_READ, false, "run-history.c", 6, &read_call);
+ /* Normally should_fail would set this. */
+ call->fail = false;
ok1(call->type == FAILTEST_READ);
+ ok1(call->can_leak == false);
ok1(strcmp(call->file, "run-history.c") == 0);
ok1(call->line == 6);
ok1(call->u.read.ret == read_call.ret);
write_call.buf = buf;
write_call.fd = open_call.ret;
write_call.count = 20;
- call = add_history(FAILTEST_WRITE, "run-history.c", 7, &write_call);
+ write_call.opener = NULL;
+ call = add_history(FAILTEST_WRITE, false, "run-history.c", 7,
+ &write_call);
+ /* Normally should_fail would set this. */
+ call->fail = false;
ok1(call->type == FAILTEST_WRITE);
+ ok1(call->can_leak == false);
ok1(strcmp(call->file, "run-history.c") == 0);
ok1(call->line == 7);
ok1(call->u.write.ret == write_call.ret);
ok1(call->u.write.buf == write_call.buf);
ok1(call->u.write.fd == write_call.fd);
ok1(call->u.write.count == write_call.count);
-
- ok1(history_num == 7);
-
- for (i = 0; i < history_num; i++)
- history[i].fail = false;
-
- print_reproduce();
- ok1(strcmp(output, "To reproduce: --failpath=cmeoprw\n") == 0);
- free(output);
- output = NULL;
-
- for (i = 0; i < history_num; i++)
- history[i].fail = true;
-
- print_reproduce();
- ok1(strcmp(output, "To reproduce: --failpath=CMEOPRW\n") == 0);
- free(output);
- output = NULL;
+ ok1(call->u.write.opener == write_call.opener);
+
+ mmap_call.ret = &mmap_call;
+ mmap_call.addr = NULL;
+ mmap_call.length = 4096;
+ mmap_call.prot = PROT_READ;
+ mmap_call.flags = 0;
+ mmap_call.fd = open_call.ret;
+ mmap_call.offset = 0;
+ mmap_call.opener = opener_of(open_call.ret);
+ ok1(mmap_call.opener->type == FAILTEST_OPEN);
+ mmap_call.saved = NULL;
+
+ call = add_history(FAILTEST_MMAP, false, "run-history.c", 8,
+ &mmap_call);
+ /* Normally should_fail would set this. */
+ call->fail = false;
+ ok1(call->type == FAILTEST_MMAP);
+ ok1(call->can_leak == false);
+ ok1(strcmp(call->file, "run-history.c") == 0);
+ ok1(call->line == 8);
+ ok1(call->u.mmap.ret == mmap_call.ret);
+ ok1(call->u.mmap.addr == mmap_call.addr);
+ ok1(call->u.mmap.length == mmap_call.length);
+ ok1(call->u.mmap.prot == mmap_call.prot);
+ ok1(call->u.mmap.flags == mmap_call.flags);
+ ok1(call->u.mmap.fd == mmap_call.fd);
+ ok1(call->u.mmap.offset == mmap_call.offset);
+ ok1(call->u.mmap.opener == mmap_call.opener);
+ ok1(call->u.mmap.saved == mmap_call.saved);
+
+ i = 0;
+ tlist_for_each(&history, call, list)
+ i++;
+
+ ok1(i == 8);
+
+ tlist_for_each(&history, call, list)
+ call->fail = false;
+
+ path = failpath_string();
+ ok1(streq(path, "cmeoprwa"));
+ free(path);
+
+ tlist_for_each(&history, call, list)
+ call->fail = true;
+
+ path = failpath_string();
+ ok1(streq(path, "CMEOPRWA"));
+ free(path);
return exit_status();
}
projects / ccan / blobdiff