summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-10-20 10:59:40 +1100
committerAndrew Tridgell <tridge@samba.org>2009-10-20 10:59:40 +1100
commit5dcf0069b68149575fe6166019dd90b73885926b (patch)
tree8b8f5944768c6d6cb4495d1cc347cdc46ba89c70
parent751fd6fb8db600b9f098fa54290c3847ace96aed (diff)
downloadsamba-5dcf0069b68149575fe6166019dd90b73885926b.tar.gz
samba-5dcf0069b68149575fe6166019dd90b73885926b.tar.bz2
samba-5dcf0069b68149575fe6166019dd90b73885926b.zip
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.
-rw-r--r--lib/tdb/tools/tdbtorture.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/tdb/tools/tdbtorture.c b/lib/tdb/tools/tdbtorture.c
index c754b817f2..bd5fb201b7 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);