failtest now culls duplicates for itself (and more efficiently), so
don't replicate the logic here. It changes things a bit, because
failtest uses backtraces rather than a simple call point to find
duplicates.
Also, fix one case (in run-11-simple-fetch.c) where we simply exited
rather than using failtest_exit(). We got away with it before, because
we never hit that particular failure pattern.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
3d99c9334fe3067c88772547b9c06acec21616ea)
-static const struct failtest_call *
-find_repeat(const struct tlist_calls *history,
- const struct failtest_call *call)
-{
- const struct failtest_call *i;
-
- tlist_for_each(history, i, list) {
- if (i != call)
- continue;
- if (failmatch(i, call->file, call->line, call->type))
- return i;
- }
- return NULL;
-}
-
static bool is_nonblocking_lock(const struct failtest_call *call)
{
return call->type == FAILTEST_FCNTL && call->u.fcntl.cmd == F_SETLK;
static bool is_nonblocking_lock(const struct failtest_call *call)
{
return call->type == FAILTEST_FCNTL && call->u.fcntl.cmd == F_SETLK;
enum failtest_result
block_repeat_failures(struct tlist_calls *history)
{
enum failtest_result
block_repeat_failures(struct tlist_calls *history)
{
- const struct failtest_call *i, *last;
+ const struct failtest_call *last;
last = tlist_tail(history, struct failtest_call, list);
last = tlist_tail(history, struct failtest_call, list);
if (failmatch(last, INITIAL_TDB_MALLOC)
|| failmatch(last, URANDOM_OPEN)
|| failmatch(last, URANDOM_READ)) {
if (failmatch(last, INITIAL_TDB_MALLOC)
|| failmatch(last, URANDOM_OPEN)
|| failmatch(last, URANDOM_READ)) {
- if (find_repeat(history, last))
- return FAIL_DONT_FAIL;
return FAIL_PROBE;
}
/* Unlock or non-blocking lock is fail-once. */
return FAIL_PROBE;
}
/* Unlock or non-blocking lock is fail-once. */
- if (is_unlock(last)) {
- /* Find a previous unlock at this point? */
- i = find_repeat(history, last);
- if (i && is_unlock(i))
- return FAIL_DONT_FAIL;
+ if (is_unlock(last) || is_nonblocking_lock(last))
- } else if (is_nonblocking_lock(last)) {
- /* Find a previous non-blocking lock at this point? */
- i = find_repeat(history, last);
- if (i && is_nonblocking_lock(i))
- return FAIL_DONT_FAIL;
- return FAIL_PROBE;
- }
}
}
ok1(tap_log_messages == 0);
}
}
ok1(tap_log_messages == 0);
+ failtest_exit(exit_status());
fail:
failtest_suppress = true;
fail:
failtest_suppress = true;