The branch, master has been updated via 5dcf006... tdb: fixed the intermittent failure of tdbtorture in the build farm from 751fd6f... Fixes for typos. Thank-you PC Oota.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 5dcf0069b68149575fe6166019dd90b73885926b Author: Andrew Tridgell <tri...@samba.org> Date: Tue Oct 20 10:59:40 2009 +1100 tdb: fixed the intermittent failure of tdbtorture in the build farm There was a race condition that caused the torture.tdb to be left in a state that needed recovery. The torture code thought that any message from the tdb code was an error, so the "recovered" message, which is a TDB_DEBUG_TRACE message, marked the run as being an error when it isn't. ----------------------------------------------------------------------- Summary of changes: lib/tdb/tools/tdbtorture.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tdb/tools/tdbtorture.c b/lib/tdb/tools/tdbtorture.c index c754b81..bd5fb20 100644 --- a/lib/tdb/tools/tdbtorture.c +++ b/lib/tdb/tools/tdbtorture.c @@ -36,8 +36,11 @@ static void tdb_log(struct tdb_context *tdb, enum tdb_debug_level level, const c static void tdb_log(struct tdb_context *tdb, enum tdb_debug_level level, const char *format, ...) { va_list ap; - - error_count++; + + /* trace level messages do not indicate an error */ + if (level != TDB_DEBUG_TRACE) { + error_count++; + } va_start(ap, format); vfprintf(stdout, format, ap); -- Samba Shared Repository