From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 9 Jun 2006 00:11:34 +0000 (+0000)
Subject: cleanup testers
X-Git-Tag: OPENLDAP_REL_ENG_2_4_3ALPHA~9^2~169
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1b23abb1080837e43aaf7d067ba28d077bc27c59;p=openldap

cleanup testers
---

diff --git a/tests/progs/slapd-bind.c b/tests/progs/slapd-bind.c
index 7118fb6b0f..5ede6aa934 100644
--- a/tests/progs/slapd-bind.c
+++ b/tests/progs/slapd-bind.c
@@ -391,7 +391,7 @@ novals:;
 		return 1;
 	}
 
-	fprintf( stderr, "PID=%ld - got %d values.\n", (long) pid, ndns );
+	fprintf( stderr, "  PID=%ld - got %d values.\n", (long) pid, ndns );
 
 	/* Ok, got list of RDNs, now start binding to each */
 	for ( i = 0; i < maxloop; i++ ) {
@@ -425,8 +425,8 @@ novals:;
 	end = GetTickCount();
 	end -= beg;
 
-	fprintf( stderr, "Done %d Binds in %d.%03d seconds.\n", i,
-		end / 1000, end % 1000 );
+	fprintf( stderr, " PID=%ld - Bind done %d in %d.%03d seconds.\n",
+		(long) pid, i, end / 1000, end % 1000 );
 #else
 	gettimeofday( &end, NULL );
 	end.tv_usec -= beg.tv_usec;
@@ -436,8 +436,8 @@ novals:;
 	}
 	end.tv_sec -= beg.tv_sec;
 
-	fprintf( stderr, "Done %d Binds in %ld.%06ld seconds.\n", i,
-		(long) end.tv_sec, (long) end.tv_usec );
+	fprintf( stderr, " PID=%ld - Bind done %d in %ld.%06ld seconds.\n",
+		(long) pid, i, (long) end.tv_sec, (long) end.tv_usec );
 #endif
 
 	if ( dns ) {
diff --git a/tests/progs/slapd-read.c b/tests/progs/slapd-read.c
index c94878acee..dc67d5ad77 100644
--- a/tests/progs/slapd-read.c
+++ b/tests/progs/slapd-read.c
@@ -261,7 +261,7 @@ do_random( char *uri, char *manager, struct berval *passwd,
 		ldap_msgfree( res );
 
 		if ( do_retry == maxretries ) {
-			fprintf( stderr, "PID=%ld - got %d values.\n", (long) pid, nvalues );
+			fprintf( stderr, "  PID=%ld - got %d values.\n", (long) pid, nvalues );
 		}
 
 		for ( i = 0; i < innerloop; i++ ) {
diff --git a/tests/progs/slapd-search.c b/tests/progs/slapd-search.c
index 51d0ff2d7d..d9407e9fe4 100644
--- a/tests/progs/slapd-search.c
+++ b/tests/progs/slapd-search.c
@@ -279,7 +279,7 @@ do_random( char *uri, char *manager, struct berval *passwd,
 		ldap_msgfree( res );
 
 		if ( do_retry == maxretries ) {
-			fprintf( stderr, "PID=%ld - got %d values.\n", (long) pid, nvalues );
+			fprintf( stderr, "  PID=%ld - got %d values.\n", (long) pid, nvalues );
 		}
 
 		for ( i = 0; i < innerloop; i++ ) {
diff --git a/tests/progs/slapd-tester.c b/tests/progs/slapd-tester.c
index 13cbc00d50..ad773a6ea0 100644
--- a/tests/progs/slapd-tester.c
+++ b/tests/progs/slapd-tester.c
@@ -643,14 +643,14 @@ main( int argc, char **argv )
 
 			bargs[banum - 4] = breqs[jj];
 			bargs[banum - 2] = bcreds[jj];
+			bargs[banum - 1] = NULL;
 			if ( battrs[jj] != NULL ) {
+				bargs[banum - 5] = "-b";
 				bargs[banum - 1] = "-a";
 				bargs[banum] = battrs[jj];
-
-			} else {
-				sargs[sanum - 1] = NULL;
 			}
 			fork_child( bcmd, bargs );
+			bargs[banum - 5] = "-D";
 		}
 	}