[SCM] Samba Shared Repository - branch v3-5-test updated

[Jeremy Allison]

The branch, v3-5-test has been updated
       via  7e75d3c... tdb: fixed the intermittent failure of tdbtorture in the build farm
      from  72ae449... util: fixed generate_unique_strs() to be portable

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 7e75d3c4fa1a7a6d3c967d6f108df0ab2ffa02ad
Author: Andrew Tridgell <tridge at 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