#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/time.h>
+#include <sys/mman.h>
#include <signal.h>
#include <assert.h>
#include <ccan/time/time.h>
static pid_t orig_pid;
-static const char info_to_arg[] = "mceoxprwf";
+static const char info_to_arg[] = "mceoxprwfa";
/* Dummy call used for failtest_undo wrappers. */
static struct failtest_call unrecorded_call;
}
free_everything();
- tell_parent(SUCCESS);
+ if (status == 0)
+ tell_parent(SUCCESS);
+ else
+ tell_parent(FAILURE);
exit(status);
}
} else {
if (tolower((unsigned char)*failpath)
!= info_to_arg[call->type])
- errx(1, "Failpath expected '%c' got '%c'\n",
- info_to_arg[call->type], *failpath);
+ errx(1, "Failpath expected '%s' got '%c'\n",
+ failpath, info_to_arg[call->type]);
call->fail = cisupper(*(failpath++));
return call->fail;
}
/* Attach debugger if they asked for it. */
if (debugpath) {
- char *path = failpath_string();
+ char *path;
+
+ /* Pretend this last call matches whatever path wanted:
+ * keeps valgrind happy. */
+ call->fail = cisupper(debugpath[strlen(debugpath)-1]);
+ path = failpath_string();
if (streq(path, debugpath)) {
char str[80];
getpid(), getpid());
if (system(str) == 0)
sleep(5);
- } else if (!strstarts(path, debugpath)) {
- fprintf(stderr, "--debugpath not followed: %s\n", path);
- debugpath = NULL;
+ } else {
+ /* Ignore last character: could be upper or lower. */
+ path[strlen(path)-1] = '\0';
+ if (!strstarts(debugpath, path)) {
+ fprintf(stderr,
+ "--debugpath not followed: %s\n", path);
+ debugpath = NULL;
+ }
}
free(path);
}
return p->u.open.ret;
}
+void *failtest_mmap(void *addr, size_t length, int prot, int flags,
+ int fd, off_t offset, const char *file, unsigned line)
+{
+ struct failtest_call *p;
+ struct mmap_call call;
+
+ call.addr = addr;
+ call.length = length;
+ call.prot = prot;
+ call.flags = flags;
+ call.offset = offset;
+ call.fd = fd;
+
+ p = add_history(FAILTEST_MMAP, file, line, &call);
+ if (should_fail(p)) {
+ p->u.mmap.ret = MAP_FAILED;
+ p->error = ENOMEM;
+ } else {
+ p->u.mmap.ret = mmap(addr, length, prot, flags, fd, offset);
+ }
+ errno = p->error;
+ return p->u.mmap.ret;
+}
+
static void cleanup_pipe(struct pipe_call *call)
{
if (!call->closed[0])